From d1e10c3d75312ff9f40ec11949aedcd01520be4d Mon Sep 17 00:00:00 2001 From: Lee Rhodes Date: Mon, 6 Oct 2025 17:31:28 -0700 Subject: [PATCH 1/7] Change name of /theta/Sketch to /theta/ThetaSketch --- .../org/apache/datasketches/theta/AnotB.java | 24 ++++---- .../apache/datasketches/theta/AnotBimpl.java | 12 ++-- .../datasketches/theta/CompactSketch.java | 6 +- .../ConcurrentBackgroundThetaPropagation.java | 4 +- .../ConcurrentDirectQuickSelectSketch.java | 2 +- .../ConcurrentHeapQuickSelectSketch.java | 2 +- .../theta/ConcurrentSharedThetaSketch.java | 2 +- .../theta/DirectCompactCompressedSketch.java | 8 +-- .../theta/DirectCompactSketch.java | 12 ++-- .../theta/DirectQuickSelectSketch.java | 2 +- .../theta/DirectQuickSelectSketchR.java | 4 +- .../datasketches/theta/HeapAlphaSketch.java | 4 +- .../theta/HeapQuickSelectSketch.java | 4 +- .../datasketches/theta/Intersection.java | 10 ++-- .../datasketches/theta/IntersectionImpl.java | 10 ++-- .../datasketches/theta/JaccardSimilarity.java | 14 ++--- .../theta/MemorySegmentHashIterator.java | 2 +- .../theta/{Sketch.java => ThetaSketch.java} | 20 +++---- .../org/apache/datasketches/theta/Union.java | 6 +- .../apache/datasketches/theta/UnionImpl.java | 8 +-- .../datasketches/theta/UpdateSketch.java | 2 +- .../BoundsOnRatiosInThetaSketchedSets.java | 8 +-- .../BoundsOnRatiosInTupleSketchedSets.java | 6 +- .../org/apache/datasketches/tuple/AnotB.java | 16 ++--- .../apache/datasketches/tuple/HashTables.java | 4 +- .../datasketches/tuple/Intersection.java | 6 +- .../datasketches/tuple/JaccardSimilarity.java | 8 +-- .../org/apache/datasketches/tuple/Union.java | 4 +- .../datasketches/theta/AnotBimplTest.java | 4 +- .../datasketches/theta/CompactSketchTest.java | 24 ++++---- ...ConcurrentDirectQuickSelectSketchTest.java | 26 ++++---- .../ConcurrentHeapQuickSelectSketchTest.java | 22 +++---- .../theta/DirectQuickSelectSketchTest.java | 28 ++++----- .../datasketches/theta/DirectUnionTest.java | 12 ++-- .../theta/HeapAlphaSketchTest.java | 24 ++++---- .../theta/HeapQuickSelectSketchTest.java | 12 ++-- .../datasketches/theta/HeapUnionTest.java | 4 +- .../theta/HeapifyWrapSerVer3Test.java | 8 +-- .../datasketches/theta/IteratorTest.java | 8 +-- .../theta/PairwiseSetOperationsTest.java | 24 ++++---- .../datasketches/theta/PreambleUtilTest.java | 14 ++--- .../theta/ReadOnlyMemorySegmentTest.java | 12 ++-- .../datasketches/theta/SetOperationTest.java | 16 ++--- .../theta/SetOpsCornerCasesTest.java | 24 ++++---- .../theta/SingleItemSketchTest.java | 12 ++-- .../datasketches/theta/SketchMiscTest.java | 18 +++--- .../apache/datasketches/theta/SketchTest.java | 60 +++++++++---------- .../datasketches/theta/UnionImplTest.java | 6 +- .../datasketches/theta/UpdateSketchTest.java | 4 +- .../tuple/adouble/AdoubleAnotBTest.java | 2 +- 50 files changed, 287 insertions(+), 287 deletions(-) rename src/main/java/org/apache/datasketches/theta/{Sketch.java => ThetaSketch.java} (96%) diff --git a/src/main/java/org/apache/datasketches/theta/AnotB.java b/src/main/java/org/apache/datasketches/theta/AnotB.java index cb195acd1..fc523115b 100644 --- a/src/main/java/org/apache/datasketches/theta/AnotB.java +++ b/src/main/java/org/apache/datasketches/theta/AnotB.java @@ -92,7 +92,7 @@ public Family getFamily() { * * @param skA The incoming sketch for the first argument, A. */ - public abstract void setA(Sketch skA); + public abstract void setA(ThetaSketch skA); /** * This is part of a multistep, stateful AnotB operation and sets the given Theta sketch as the @@ -111,12 +111,12 @@ public Family getFamily() { * * @param skB The incoming Theta sketch for the second (or following) argument B. */ - public abstract void notB(Sketch skB); + public abstract void notB(ThetaSketch skB); /** * Gets the result of the multistep, stateful operation AnotB that have been executed with calls - * to {@link #setA(Sketch)} and ({@link #notB(Sketch)} or - * {@link #notB(org.apache.datasketches.theta.Sketch)}). + * to {@link #setA(ThetaSketch)} and ({@link #notB(ThetaSketch)} or + * {@link #notB(org.apache.datasketches.theta.ThetaSketch)}). * * @param reset If true, clears this operator to the empty state after this result is * returned. Set this to false if you wish to obtain an intermediate result. @@ -127,8 +127,8 @@ public Family getFamily() { /** * Gets the result of the multistep, stateful operation AnotB that have been executed with calls - * to {@link #setA(Sketch)} and ({@link #notB(Sketch)} or - * {@link #notB(org.apache.datasketches.theta.Sketch)}). + * to {@link #setA(ThetaSketch)} and ({@link #notB(ThetaSketch)} or + * {@link #notB(org.apache.datasketches.theta.ThetaSketch)}). * * @param dstOrdered If true, the result will be an ordered {@link CompactSketch}. * See Destination Ordered. @@ -147,8 +147,8 @@ public Family getFamily() { * ordered CompactSketch on the heap. * *

This a stateless operation and has no impact on the internal state of this operator. - * Thus, this is not an accumulating update and does not interact with the {@link #setA(Sketch)}, - * {@link #notB(Sketch)}, {@link #getResult(boolean)}, or + * Thus, this is not an accumulating update and does not interact with the {@link #setA(ThetaSketch)}, + * {@link #notB(ThetaSketch)}, {@link #getResult(boolean)}, or * {@link #getResult(boolean, MemorySegment, boolean)} methods.

* *

If either argument is null an exception is thrown.

@@ -166,7 +166,7 @@ public Family getFamily() { * @param skB The incoming sketch for the second argument. It must not be null. * @return an ordered CompactSketch on the heap */ - public CompactSketch aNotB(final Sketch skA, final Sketch skB) { + public CompactSketch aNotB(final ThetaSketch skA, final ThetaSketch skB) { return aNotB(skA, skB, true, null); } @@ -175,8 +175,8 @@ public CompactSketch aNotB(final Sketch skA, final Sketch skB) { * CompactSketch. * *

This a stateless operation and has no impact on the internal state of this operator. - * Thus, this is not an accumulating update and does not interact with the {@link #setA(Sketch)}, - * {@link #notB(Sketch)}, {@link #getResult(boolean)}, or + * Thus, this is not an accumulating update and does not interact with the {@link #setA(ThetaSketch)}, + * {@link #notB(ThetaSketch)}, {@link #getResult(boolean)}, or * {@link #getResult(boolean, MemorySegment, boolean)} methods.

* *

If either argument is null an exception is thrown.

@@ -197,7 +197,7 @@ public CompactSketch aNotB(final Sketch skA, final Sketch skB) { * @param dstSeg the destination MemorySegment * @return the result as a CompactSketch. */ - public abstract CompactSketch aNotB(Sketch skA, Sketch skB, boolean dstOrdered, + public abstract CompactSketch aNotB(ThetaSketch skA, ThetaSketch skB, boolean dstOrdered, MemorySegment dstSeg); } diff --git a/src/main/java/org/apache/datasketches/theta/AnotBimpl.java b/src/main/java/org/apache/datasketches/theta/AnotBimpl.java index 08ec155d7..dc9ecb657 100644 --- a/src/main/java/org/apache/datasketches/theta/AnotBimpl.java +++ b/src/main/java/org/apache/datasketches/theta/AnotBimpl.java @@ -65,7 +65,7 @@ private AnotBimpl(final short seedHash) { } @Override - public void setA(final Sketch skA) { + public void setA(final ThetaSketch skA) { if (skA == null) { reset(); throw new SketchesArgumentException("The input argument A must not be null"); @@ -85,7 +85,7 @@ public void setA(final Sketch skA) { } @Override - public void notB(final Sketch skB) { + public void notB(final ThetaSketch skB) { if (empty_ || (skB == null) || skB.isEmpty()) { return; } //local and skB is not empty Util.checkSeedHashes(seedHash_, skB.getSeedHash()); @@ -113,7 +113,7 @@ public CompactSketch getResult(final boolean dstOrdered, final MemorySegment dst } @Override - public CompactSketch aNotB(final Sketch skA, final Sketch skB, final boolean dstOrdered, + public CompactSketch aNotB(final ThetaSketch skA, final ThetaSketch skB, final boolean dstOrdered, final MemorySegment dstSeg) { if ((skA == null) || (skB == null)) { throw new SketchesArgumentException("Neither argument may be null"); @@ -152,7 +152,7 @@ int getRetainedEntries() { //restricted - private static long[] getHashArrA(final Sketch skA) { //returns a new array + private static long[] getHashArrA(final ThetaSketch skA) { //returns a new array //Get skA cache as array final CompactSketch cskA = skA.compact(false, null); //sorting not required return cskA.getCache().clone(); @@ -162,7 +162,7 @@ private static long[] getResultHashArr( //returns a new array final long minThetaLong, final int countA, final long[] hashArrA, - final Sketch skB) { + final ThetaSketch skB) { // Rebuild or get hashtable of skB final long[] hashTableB; //read only @@ -192,7 +192,7 @@ private static long[] getResultHashArr( //returns a new array } private static long[] convertToHashTable( - final Sketch sketch, + final ThetaSketch sketch, final long thetaLong, final double rebuildThreshold) { final int lgArrLongs = minLgHashTableSize(sketch.getRetainedEntries(true), rebuildThreshold); diff --git a/src/main/java/org/apache/datasketches/theta/CompactSketch.java b/src/main/java/org/apache/datasketches/theta/CompactSketch.java index aaa751af0..d560a8729 100644 --- a/src/main/java/org/apache/datasketches/theta/CompactSketch.java +++ b/src/main/java/org/apache/datasketches/theta/CompactSketch.java @@ -58,7 +58,7 @@ * * @author Lee Rhodes */ -public abstract class CompactSketch extends Sketch { +public abstract class CompactSketch extends ThetaSketch { /** * Heapify takes a CompactSketch image in a MemorySegment and instantiates an on-heap CompactSketch. @@ -303,7 +303,7 @@ public boolean isSameResource(final MemorySegment that) { @Override public double getEstimate() { - return Sketch.estimate(getThetaLong(), getRetainedEntries()); + return ThetaSketch.estimate(getThetaLong(), getRetainedEntries()); } /** @@ -386,7 +386,7 @@ private byte[] toByteArrayV4() { } private static CompactSketch heapifyV4(final MemorySegment srcSeg, final long seed) { - final int preLongs = Sketch.getPreambleLongs(srcSeg); + final int preLongs = ThetaSketch.getPreambleLongs(srcSeg); final int entryBits = extractEntryBitsV4(srcSeg); final int numEntriesBytes = extractNumEntriesBytesV4(srcSeg); final short seedHash = (short) extractSeedHash(srcSeg); diff --git a/src/main/java/org/apache/datasketches/theta/ConcurrentBackgroundThetaPropagation.java b/src/main/java/org/apache/datasketches/theta/ConcurrentBackgroundThetaPropagation.java index c3d8bfaa5..b3e863532 100644 --- a/src/main/java/org/apache/datasketches/theta/ConcurrentBackgroundThetaPropagation.java +++ b/src/main/java/org/apache/datasketches/theta/ConcurrentBackgroundThetaPropagation.java @@ -40,7 +40,7 @@ final class ConcurrentBackgroundThetaPropagation implements Runnable { private final AtomicBoolean localPropagationInProgress; // Sketch to be propagated to shared sketch. Can be null if only a single hash is propagated - private final Sketch sketchIn; + private final ThetaSketch sketchIn; // Hash of the datum to be propagated to shared sketch. Can be ConcurrentSharedThetaSketch.NOT_SINGLE_HASH // if the data is propagated through a sketch. @@ -52,7 +52,7 @@ final class ConcurrentBackgroundThetaPropagation implements Runnable { private final long epoch; ConcurrentBackgroundThetaPropagation(final ConcurrentSharedThetaSketch sharedThetaSketch, - final AtomicBoolean localPropagationInProgress, final Sketch sketchIn, final long singleHash, + final AtomicBoolean localPropagationInProgress, final ThetaSketch sketchIn, final long singleHash, final long epoch) { this.sharedThetaSketch = sharedThetaSketch; this.localPropagationInProgress = localPropagationInProgress; diff --git a/src/main/java/org/apache/datasketches/theta/ConcurrentDirectQuickSelectSketch.java b/src/main/java/org/apache/datasketches/theta/ConcurrentDirectQuickSelectSketch.java index b70fdda36..76aac8d9d 100644 --- a/src/main/java/org/apache/datasketches/theta/ConcurrentDirectQuickSelectSketch.java +++ b/src/main/java/org/apache/datasketches/theta/ConcurrentDirectQuickSelectSketch.java @@ -207,7 +207,7 @@ public void initBgPropagationService() { @Override public boolean propagate(final AtomicBoolean localPropagationInProgress, - final Sketch sketchIn, final long singleHash) { + final ThetaSketch sketchIn, final long singleHash) { final long epoch = epoch_; if (singleHash != NOT_SINGLE_HASH // namely, is a single hash and && getRetainedEntries(false) < exactLimit_) { // a small sketch then propagate myself (blocking) diff --git a/src/main/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketch.java b/src/main/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketch.java index c061bde1d..dddfd1548 100644 --- a/src/main/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketch.java +++ b/src/main/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketch.java @@ -199,7 +199,7 @@ public void initBgPropagationService() { @Override public boolean propagate(final AtomicBoolean localPropagationInProgress, - final Sketch sketchIn, final long singleHash) { + final ThetaSketch sketchIn, final long singleHash) { final long epoch = epoch_; if ((singleHash != NOT_SINGLE_HASH) //namely, is a single hash and && (getRetainedEntries(false) < exactLimit_)) { //a small sketch then propagate myself (blocking) diff --git a/src/main/java/org/apache/datasketches/theta/ConcurrentSharedThetaSketch.java b/src/main/java/org/apache/datasketches/theta/ConcurrentSharedThetaSketch.java index 3dda0c31f..cef561d58 100644 --- a/src/main/java/org/apache/datasketches/theta/ConcurrentSharedThetaSketch.java +++ b/src/main/java/org/apache/datasketches/theta/ConcurrentSharedThetaSketch.java @@ -86,7 +86,7 @@ static long computeExactLimit(final long k, final double error) { * @param singleHash a single hash value * @return true if propagation successfully started */ - boolean propagate(final AtomicBoolean localPropagationInProgress, final Sketch sketchIn, + boolean propagate(final AtomicBoolean localPropagationInProgress, final ThetaSketch sketchIn, final long singleHash); /** diff --git a/src/main/java/org/apache/datasketches/theta/DirectCompactCompressedSketch.java b/src/main/java/org/apache/datasketches/theta/DirectCompactCompressedSketch.java index 4a3b80839..f0b850eb7 100644 --- a/src/main/java/org/apache/datasketches/theta/DirectCompactCompressedSketch.java +++ b/src/main/java/org/apache/datasketches/theta/DirectCompactCompressedSketch.java @@ -74,7 +74,7 @@ public CompactSketch compact(final boolean dstOrdered, final MemorySegment dstSe @Override public int getCurrentBytes() { - final int preLongs = Sketch.getPreambleLongs(seg_); + final int preLongs = ThetaSketch.getPreambleLongs(seg_); final int entryBits = extractEntryBitsV4(seg_); final int numEntriesBytes = extractNumEntriesBytesV4(seg_); return preLongs * Long.BYTES + numEntriesBytes + wholeBytesToHoldBits(getRetainedEntries() * entryBits); @@ -88,7 +88,7 @@ public int getRetainedEntries(final boolean valid) { //valid is only relevant fo // number of entries is stored using variable length encoding // most significant bytes with all zeros are not stored // one byte in the preamble has the number of non-zero bytes used - final int preLongs = Sketch.getPreambleLongs(seg_); // if > 1 then the second long has theta + final int preLongs = ThetaSketch.getPreambleLongs(seg_); // if > 1 then the second long has theta final int numEntriesBytes = extractNumEntriesBytesV4(seg_); int offsetBytes = preLongs > 1 ? START_PACKED_DATA_ESTIMATION_MODE : START_PACKED_DATA_EXACT_MODE; int numEntries = 0; @@ -100,7 +100,7 @@ public int getRetainedEntries(final boolean valid) { //valid is only relevant fo @Override public long getThetaLong() { - final int preLongs = Sketch.getPreambleLongs(seg_); + final int preLongs = ThetaSketch.getPreambleLongs(seg_); return (preLongs > 1) ? extractThetaLongV4(seg_) : Long.MAX_VALUE; } @@ -118,7 +118,7 @@ public boolean isOrdered() { public HashIterator iterator() { return new MemorySegmentCompactCompressedHashIterator( seg_, - (Sketch.getPreambleLongs(seg_) > 1 ? START_PACKED_DATA_ESTIMATION_MODE : START_PACKED_DATA_EXACT_MODE) + (ThetaSketch.getPreambleLongs(seg_) > 1 ? START_PACKED_DATA_ESTIMATION_MODE : START_PACKED_DATA_EXACT_MODE) + extractNumEntriesBytesV4(seg_), extractEntryBitsV4(seg_), getRetainedEntries() diff --git a/src/main/java/org/apache/datasketches/theta/DirectCompactSketch.java b/src/main/java/org/apache/datasketches/theta/DirectCompactSketch.java index f393dc5b8..b5794aeb6 100644 --- a/src/main/java/org/apache/datasketches/theta/DirectCompactSketch.java +++ b/src/main/java/org/apache/datasketches/theta/DirectCompactSketch.java @@ -81,7 +81,7 @@ public CompactSketch compact(final boolean dstOrdered, final MemorySegment dstSe @Override public int getCurrentBytes() { if (checkForSingleItem(seg_)) { return 16; } - final int preLongs = Sketch.getPreambleLongs(seg_); + final int preLongs = ThetaSketch.getPreambleLongs(seg_); final int curCount = (preLongs == 1) ? 0 : extractCurCount(seg_); return (preLongs + curCount) << 3; } @@ -89,13 +89,13 @@ public int getCurrentBytes() { @Override public int getRetainedEntries(final boolean valid) { //valid is only relevant for the Alpha Sketch if (checkForSingleItem(seg_)) { return 1; } - final int preLongs = Sketch.getPreambleLongs(seg_); + final int preLongs = ThetaSketch.getPreambleLongs(seg_); return (preLongs == 1) ? 0 : extractCurCount(seg_); } @Override public long getThetaLong() { - final int preLongs = Sketch.getPreambleLongs(seg_); + final int preLongs = ThetaSketch.getPreambleLongs(seg_); return (preLongs > 2) ? extractThetaLong(seg_) : Long.MAX_VALUE; } @@ -147,7 +147,7 @@ public byte[] toByteArray() { @Override long[] getCache() { if (checkForSingleItem(seg_)) { return new long[] { seg_.get(JAVA_LONG_UNALIGNED, 8) }; } - final int preLongs = Sketch.getPreambleLongs(seg_); + final int preLongs = ThetaSketch.getPreambleLongs(seg_); final int curCount = (preLongs == 1) ? 0 : extractCurCount(seg_); if (curCount > 0) { final long[] cache = new long[curCount]; @@ -159,12 +159,12 @@ long[] getCache() { @Override int getCompactPreambleLongs() { - return Sketch.getPreambleLongs(seg_); + return ThetaSketch.getPreambleLongs(seg_); } @Override int getCurrentPreambleLongs() { - return Sketch.getPreambleLongs(seg_); + return ThetaSketch.getPreambleLongs(seg_); } @Override diff --git a/src/main/java/org/apache/datasketches/theta/DirectQuickSelectSketch.java b/src/main/java/org/apache/datasketches/theta/DirectQuickSelectSketch.java index 723b6cc75..d1cbb740f 100644 --- a/src/main/java/org/apache/datasketches/theta/DirectQuickSelectSketch.java +++ b/src/main/java/org/apache/datasketches/theta/DirectQuickSelectSketch.java @@ -175,7 +175,7 @@ static DirectQuickSelectSketch writableWrap( final MemorySegment srcSeg, final MemorySegmentRequest mSegReq, final long seed) { - final int preambleLongs = Sketch.getPreambleLongs(srcSeg); //byte 0 + final int preambleLongs = ThetaSketch.getPreambleLongs(srcSeg); //byte 0 final int lgNomLongs = extractLgNomLongs(srcSeg); //byte 3 final int lgArrLongs = extractLgArrLongs(srcSeg); //byte 4 diff --git a/src/main/java/org/apache/datasketches/theta/DirectQuickSelectSketchR.java b/src/main/java/org/apache/datasketches/theta/DirectQuickSelectSketchR.java index f78fbced4..7b07d660f 100644 --- a/src/main/java/org/apache/datasketches/theta/DirectQuickSelectSketchR.java +++ b/src/main/java/org/apache/datasketches/theta/DirectQuickSelectSketchR.java @@ -136,7 +136,7 @@ public int getCurrentBytes() { public double getEstimate() { final int curCount = extractCurCount(wseg_); final long thetaLong = extractThetaLong(wseg_); - return Sketch.estimate(thetaLong, curCount); + return ThetaSketch.estimate(thetaLong, curCount); } @Override @@ -238,7 +238,7 @@ int getCompactPreambleLongs() { @Override int getCurrentPreambleLongs() { - return Sketch.getPreambleLongs(wseg_); + return ThetaSketch.getPreambleLongs(wseg_); } @Override diff --git a/src/main/java/org/apache/datasketches/theta/HeapAlphaSketch.java b/src/main/java/org/apache/datasketches/theta/HeapAlphaSketch.java index 5a5c16f00..846fb02b6 100644 --- a/src/main/java/org/apache/datasketches/theta/HeapAlphaSketch.java +++ b/src/main/java/org/apache/datasketches/theta/HeapAlphaSketch.java @@ -134,7 +134,7 @@ static HeapAlphaSketch heapifyInstance(final MemorySegment srcSeg) { static HeapAlphaSketch heapifyInstance(final MemorySegment srcSeg, final long expectedSeed) { Objects.requireNonNull(srcSeg, "Source MemorySegment must not be null"); checkBounds(0, 24, srcSeg.byteSize()); - final int preambleLongs = Sketch.getPreambleLongs(srcSeg); //byte 0 + final int preambleLongs = ThetaSketch.getPreambleLongs(srcSeg); //byte 0 final int lgNomLongs = extractLgNomLongs(srcSeg); //byte 3 final int lgArrLongs = extractLgArrLongs(srcSeg); //byte 4 @@ -179,7 +179,7 @@ public HashIterator iterator() { @Override public double getEstimate() { return (thetaLong_ > split1_) - ? Sketch.estimate(thetaLong_, curCount_) + ? ThetaSketch.estimate(thetaLong_, curCount_) : (1 << lgNomLongs_) * (LONG_MAX_VALUE_AS_DOUBLE / thetaLong_); } diff --git a/src/main/java/org/apache/datasketches/theta/HeapQuickSelectSketch.java b/src/main/java/org/apache/datasketches/theta/HeapQuickSelectSketch.java index c23deebf1..89f4f21f5 100644 --- a/src/main/java/org/apache/datasketches/theta/HeapQuickSelectSketch.java +++ b/src/main/java/org/apache/datasketches/theta/HeapQuickSelectSketch.java @@ -107,7 +107,7 @@ private HeapQuickSelectSketch(final int lgNomLongs, final long seed, final float * @return instance of this sketch */ static HeapQuickSelectSketch heapifyInstance(final MemorySegment srcSeg, final long seed) { - final int preambleLongs = Sketch.getPreambleLongs(srcSeg); //byte 0 + final int preambleLongs = ThetaSketch.getPreambleLongs(srcSeg); //byte 0 final int lgNomLongs = extractLgNomLongs(srcSeg); //byte 3 final int lgArrLongs = extractLgArrLongs(srcSeg); //byte 4 @@ -140,7 +140,7 @@ static HeapQuickSelectSketch heapifyInstance(final MemorySegment srcSeg, final l @Override public double getEstimate() { - return Sketch.estimate(thetaLong_, curCount_); + return ThetaSketch.estimate(thetaLong_, curCount_); } @Override diff --git a/src/main/java/org/apache/datasketches/theta/Intersection.java b/src/main/java/org/apache/datasketches/theta/Intersection.java index 134c49ff6..4482df91c 100644 --- a/src/main/java/org/apache/datasketches/theta/Intersection.java +++ b/src/main/java/org/apache/datasketches/theta/Intersection.java @@ -43,7 +43,7 @@ public Family getFamily() { /** * Gets the result of this operation as an ordered CompactSketch on the Java heap. * This does not disturb the underlying data structure of this intersection. - * The {@link #intersect(Sketch)} method must have been called at least once, otherwise an + * The {@link #intersect(ThetaSketch)} method must have been called at least once, otherwise an * exception will be thrown. This is because a virgin Intersection object represents the * Universal Set, which has an infinite number of values. * @return the result of this operation as an ordered CompactSketch on the Java heap @@ -55,7 +55,7 @@ public CompactSketch getResult() { /** * Gets the result of this operation as a CompactSketch in the given dstSeg. * This does not disturb the underlying data structure of this intersection. - * The {@link #intersect(Sketch)} method must have been called at least once, otherwise an + * The {@link #intersect(ThetaSketch)} method must have been called at least once, otherwise an * exception will be thrown. This is because a virgin Intersection object represents the * Universal Set, which has an infinite number of values. * @@ -102,7 +102,7 @@ public CompactSketch getResult() { * Theta will become the minimum of thetas seen so far. * @param sketchIn the given sketch */ - public abstract void intersect(Sketch sketchIn); + public abstract void intersect(ThetaSketch sketchIn); /** * Perform intersect set operation on the two given sketch arguments and return the result as an @@ -111,7 +111,7 @@ public CompactSketch getResult() { * @param b The second sketch argument * @return an ordered CompactSketch on the heap */ - public CompactSketch intersect(final Sketch a, final Sketch b) { + public CompactSketch intersect(final ThetaSketch a, final ThetaSketch b) { return intersect(a, b, true, null); } @@ -125,7 +125,7 @@ public CompactSketch intersect(final Sketch a, final Sketch b) { * @param dstSeg the destination MemorySegment. * @return the result as a CompactSketch. */ - public abstract CompactSketch intersect(Sketch a, Sketch b, boolean dstOrdered, + public abstract CompactSketch intersect(ThetaSketch a, ThetaSketch b, boolean dstOrdered, MemorySegment dstSeg); /** diff --git a/src/main/java/org/apache/datasketches/theta/IntersectionImpl.java b/src/main/java/org/apache/datasketches/theta/IntersectionImpl.java index 6819524b1..54a513831 100644 --- a/src/main/java/org/apache/datasketches/theta/IntersectionImpl.java +++ b/src/main/java/org/apache/datasketches/theta/IntersectionImpl.java @@ -220,7 +220,7 @@ static IntersectionImpl wrapInstance( } @Override - public CompactSketch intersect(final Sketch a, final Sketch b, final boolean dstOrdered, final MemorySegment dstSeg) { + public CompactSketch intersect(final ThetaSketch a, final ThetaSketch b, final boolean dstOrdered, final MemorySegment dstSeg) { if ((wseg_ != null) && readOnly_) { throw new SketchesReadOnlyException(); } hardReset(); intersect(a); @@ -231,7 +231,7 @@ public CompactSketch intersect(final Sketch a, final Sketch b, final boolean dst } @Override - public void intersect(final Sketch sketchIn) { + public void intersect(final ThetaSketch sketchIn) { if (sketchIn == null) { throw new SketchesArgumentException("Intersection argument must not be null."); } @@ -439,7 +439,7 @@ long getThetaLong() { return thetaLong_; } - private void performIntersect(final Sketch sketchIn) { + private void performIntersect(final ThetaSketch sketchIn) { // curCount and input data are nonzero, match against HT assert (curCount_ > 0) && !empty_; final long[] hashTable; @@ -507,7 +507,7 @@ private void moveDataToTgt(final long[] arr, final int count) { assert tmpCnt == count : "Intersection Count Check: got: " + tmpCnt + ", expected: " + count; } - private void moveDataToTgt(final Sketch sketch) { + private void moveDataToTgt(final ThetaSketch sketch) { final int count = sketch.getRetainedEntries(); int tmpCnt = 0; if (wseg_ != null) { //Off Heap puts directly into mem @@ -620,7 +620,7 @@ private static void segChecks(final MemorySegment srcSeg) { //Get Preamble //Note: Intersection does not use lgNomLongs (or k), per se. //seedHash loaded and checked in private constructor - final int preLongs = Sketch.getPreambleLongs(srcSeg); + final int preLongs = ThetaSketch.getPreambleLongs(srcSeg); final int serVer = extractSerVer(srcSeg); final int famID = extractFamilyID(srcSeg); final boolean empty = (extractFlags(srcSeg) & EMPTY_FLAG_MASK) > 0; diff --git a/src/main/java/org/apache/datasketches/theta/JaccardSimilarity.java b/src/main/java/org/apache/datasketches/theta/JaccardSimilarity.java index a058f649a..0a71d6fbc 100644 --- a/src/main/java/org/apache/datasketches/theta/JaccardSimilarity.java +++ b/src/main/java/org/apache/datasketches/theta/JaccardSimilarity.java @@ -54,7 +54,7 @@ private JaccardSimilarity() { } * @return a double array {LowerBound, Estimate, UpperBound} of the Jaccard index. * The Upper and Lower bounds are for a confidence interval of 95.4% or +/- 2 standard deviations. */ - public static double[] jaccard(final Sketch sketchA, final Sketch sketchB) { + public static double[] jaccard(final ThetaSketch sketchA, final ThetaSketch sketchB) { //Corner case checks if (sketchA == null || sketchB == null) { return ZEROS.clone(); } if (sketchA == sketchB) { return ONES.clone(); } @@ -72,7 +72,7 @@ public static double[] jaccard(final Sketch sketchA, final Sketch sketchB) { SetOperation.builder().setNominalEntries(newK).buildUnion(); union.union(sketchA); union.union(sketchB); - final Sketch unionAB = union.getResult(false, null); + final ThetaSketch unionAB = union.getResult(false, null); final long thetaLongUAB = unionAB.getThetaLong(); final long thetaLongA = sketchA.getThetaLong(); final long thetaLongB = sketchB.getThetaLong(); @@ -89,7 +89,7 @@ public static double[] jaccard(final Sketch sketchA, final Sketch sketchB) { inter.intersect(sketchA); inter.intersect(sketchB); inter.intersect(unionAB); //ensures that intersection is a subset of the union - final Sketch interABU = inter.getResult(false, null); + final ThetaSketch interABU = inter.getResult(false, null); final double lb = getLowerBoundForBoverA(unionAB, interABU); final double est = getEstimateOfBoverA(unionAB, interABU); @@ -105,7 +105,7 @@ public static double[] jaccard(final Sketch sketchA, final Sketch sketchB) { * @return true if the two given sketches have exactly the same hash values and the same * theta values. */ - public static boolean exactlyEqual(final Sketch sketchA, final Sketch sketchB) { + public static boolean exactlyEqual(final ThetaSketch sketchA, final ThetaSketch sketchB) { //Corner case checks if (sketchA == null || sketchB == null) { return false; } if (sketchA == sketchB) { return true; } @@ -120,7 +120,7 @@ public static boolean exactlyEqual(final Sketch sketchA, final Sketch sketchB) { SetOperation.builder().setNominalEntries(ceilingPowerOf2(countA + countB)).buildUnion(); union.union(sketchA); union.union(sketchB); - final Sketch unionAB = union.getResult(); + final ThetaSketch unionAB = union.getResult(); final long thetaLongUAB = unionAB.getThetaLong(); final long thetaLongA = sketchA.getThetaLong(); final long thetaLongB = sketchB.getThetaLong(); @@ -147,7 +147,7 @@ public static boolean exactlyEqual(final Sketch sketchA, final Sketch sketchB) { * @return if true, the similarity of the two sketches is greater than the given threshold * with at least 97.7% confidence. */ - public static boolean similarityTest(final Sketch measured, final Sketch expected, + public static boolean similarityTest(final ThetaSketch measured, final ThetaSketch expected, final double threshold) { //index 0: the lower bound //index 1: the mean estimate @@ -169,7 +169,7 @@ public static boolean similarityTest(final Sketch measured, final Sketch expecte * @return if true, the dissimilarity of the two sketches is greater than the given threshold * with at least 97.7% confidence. */ - public static boolean dissimilarityTest(final Sketch measured, final Sketch expected, + public static boolean dissimilarityTest(final ThetaSketch measured, final ThetaSketch expected, final double threshold) { //index 0: the lower bound //index 1: the mean estimate diff --git a/src/main/java/org/apache/datasketches/theta/MemorySegmentHashIterator.java b/src/main/java/org/apache/datasketches/theta/MemorySegmentHashIterator.java index 53344c8d6..89d6b19f2 100644 --- a/src/main/java/org/apache/datasketches/theta/MemorySegmentHashIterator.java +++ b/src/main/java/org/apache/datasketches/theta/MemorySegmentHashIterator.java @@ -38,7 +38,7 @@ final class MemorySegmentHashIterator implements HashIterator { this.seg = srcSeg; this.arrLongs = arrLongs; this.thetaLong = thetaLong; - offsetBytes = Sketch.getPreambleLongs(srcSeg) << 3; + offsetBytes = ThetaSketch.getPreambleLongs(srcSeg) << 3; index = -1; hash = 0; } diff --git a/src/main/java/org/apache/datasketches/theta/Sketch.java b/src/main/java/org/apache/datasketches/theta/ThetaSketch.java similarity index 96% rename from src/main/java/org/apache/datasketches/theta/Sketch.java rename to src/main/java/org/apache/datasketches/theta/ThetaSketch.java index d14519062..d3a1c2bfd 100644 --- a/src/main/java/org/apache/datasketches/theta/Sketch.java +++ b/src/main/java/org/apache/datasketches/theta/ThetaSketch.java @@ -49,9 +49,9 @@ * * @author Lee Rhodes */ -public abstract class Sketch implements MemorySegmentStatus { +public abstract class ThetaSketch implements MemorySegmentStatus { - Sketch() {} + ThetaSketch() {} //public static factory constructor-type methods @@ -68,7 +68,7 @@ public abstract class Sketch implements MemorySegmentStatus { * * @return a Sketch on the heap. */ - public static Sketch heapify(final MemorySegment srcSeg) { + public static ThetaSketch heapify(final MemorySegment srcSeg) { return heapify(srcSeg, Util.DEFAULT_UPDATE_SEED); } @@ -86,7 +86,7 @@ public static Sketch heapify(final MemorySegment srcSeg) { * Compact sketches store a 16-bit hash of the seed, but not the seed itself. * @return a Sketch on the heap. */ - public static Sketch heapify(final MemorySegment srcSeg, final long expectedSeed) { + public static ThetaSketch heapify(final MemorySegment srcSeg, final long expectedSeed) { checkSegPreambleCap(srcSeg); final int familyID = extractFamilyID(srcSeg); if (familyID == Family.COMPACT.getID()) { @@ -113,7 +113,7 @@ public static Sketch heapify(final MemorySegment srcSeg, final long expectedSeed * @param srcSeg a MemorySegment with an image of a Sketch. * @return a read-only Sketch backed by the given MemorySegment */ - public static Sketch wrap(final MemorySegment srcSeg) { + public static ThetaSketch wrap(final MemorySegment srcSeg) { return wrap(srcSeg, Util.DEFAULT_UPDATE_SEED); } @@ -136,7 +136,7 @@ public static Sketch wrap(final MemorySegment srcSeg) { * See Update Hash Seed. * @return a read-only Sketch backed by the given MemorySegment. */ - public static Sketch wrap(final MemorySegment srcSeg, final long expectedSeed) { + public static ThetaSketch wrap(final MemorySegment srcSeg, final long expectedSeed) { checkSegPreambleCap(srcSeg); final int familyID = extractFamilyID(srcSeg); if (familyID == Family.QUICKSELECT.getID()) { @@ -242,7 +242,7 @@ public static double getEstimate(final MemorySegment srcSeg) { throw new SketchesArgumentException("Source MemorySegment not a valid Sketch Family: " + Family.idToFamily(familyId).toString()); } - return Sketch.estimate(extractThetaLong(srcSeg), getRetainedEntries(srcSeg)); + return ThetaSketch.estimate(extractThetaLong(srcSeg), getRetainedEntries(srcSeg)); } /** @@ -633,7 +633,7 @@ static final double estimate(final long thetaLong, final int curCount) { * @return the lower bound. */ public static double getLowerBound(final int numStdDev, final MemorySegment srcSeg) { - return lowerBound(getRetainedEntries(srcSeg), Sketch.getThetaLong(srcSeg), numStdDev, Sketch.getEmpty(srcSeg)); + return lowerBound(getRetainedEntries(srcSeg), ThetaSketch.getThetaLong(srcSeg), numStdDev, ThetaSketch.getEmpty(srcSeg)); } static final double lowerBound(final int curCount, final long thetaLong, final int numStdDev, final boolean empty) { @@ -652,7 +652,7 @@ static final double lowerBound(final int curCount, final long thetaLong, final i * @return the upper bound. */ public static double getUpperBound(final int numStdDev, final MemorySegment srcSeg) { - return upperBound(getRetainedEntries(srcSeg), Sketch.getThetaLong(srcSeg), numStdDev, Sketch.getEmpty(srcSeg)); + return upperBound(getRetainedEntries(srcSeg), ThetaSketch.getThetaLong(srcSeg), numStdDev, ThetaSketch.getEmpty(srcSeg)); } static final double upperBound(final int curCount, final long thetaLong, final int numStdDev, @@ -668,7 +668,7 @@ static final double upperBound(final int curCount, final long thetaLong, final i * See Update Hash Seed. * @return a Sketch */ - private static final Sketch heapifyUpdateSketchFromMemorySegment(final MemorySegment srcSeg, final long expectedSeed) { + private static final ThetaSketch heapifyUpdateSketchFromMemorySegment(final MemorySegment srcSeg, final long expectedSeed) { final Family family = idToFamily(extractFamilyID(srcSeg)); if (family == Family.ALPHA) { diff --git a/src/main/java/org/apache/datasketches/theta/Union.java b/src/main/java/org/apache/datasketches/theta/Union.java index 7503729cb..25b00a7f7 100644 --- a/src/main/java/org/apache/datasketches/theta/Union.java +++ b/src/main/java/org/apache/datasketches/theta/Union.java @@ -154,7 +154,7 @@ public Family getFamily() { * @param sketchB The second argument * @return the result ordered CompactSketch on the heap. */ - public CompactSketch union(final Sketch sketchA, final Sketch sketchB) { + public CompactSketch union(final ThetaSketch sketchA, final ThetaSketch sketchB) { return union(sketchA, sketchB, true, null); } @@ -170,7 +170,7 @@ public CompactSketch union(final Sketch sketchA, final Sketch sketchB) { * @param dstSeg If not null, the returned CompactSketch will be placed in this MemorySegment. * @return the result CompactSketch. */ - public abstract CompactSketch union(Sketch sketchA, Sketch sketchB, boolean dstOrdered, + public abstract CompactSketch union(ThetaSketch sketchA, ThetaSketch sketchB, boolean dstOrdered, MemorySegment dstSeg); /** @@ -183,7 +183,7 @@ public abstract CompactSketch union(Sketch sketchA, Sketch sketchB, boolean dstO * * @param sketchIn The incoming sketch. */ - public abstract void union(Sketch sketchIn); + public abstract void union(ThetaSketch sketchIn); /** * Perform a Union operation with this union and the given MemorySegment image of any sketch of the diff --git a/src/main/java/org/apache/datasketches/theta/UnionImpl.java b/src/main/java/org/apache/datasketches/theta/UnionImpl.java index bbefd958c..dcc773996 100644 --- a/src/main/java/org/apache/datasketches/theta/UnionImpl.java +++ b/src/main/java/org/apache/datasketches/theta/UnionImpl.java @@ -258,7 +258,7 @@ public byte[] toByteArray() { } @Override //Stateless Union - public CompactSketch union(final Sketch sketchA, final Sketch sketchB, final boolean dstOrdered, + public CompactSketch union(final ThetaSketch sketchA, final ThetaSketch sketchB, final boolean dstOrdered, final MemorySegment dstSeg) { reset(); union(sketchA); @@ -269,7 +269,7 @@ public CompactSketch union(final Sketch sketchA, final Sketch sketchB, final boo } @Override - public void union(final Sketch sketchIn) { + public void union(final ThetaSketch sketchIn) { //UNION Empty Rule: AND the empty states. if (sketchIn == null || sketchIn.isEmpty()) { @@ -305,7 +305,7 @@ public void union(final Sketch sketchIn) { @Override public void union(final MemorySegment seg) { Objects.requireNonNull(seg, "MemorySegment must be non-null"); - union(Sketch.wrap(seg.asReadOnly())); + union(ThetaSketch.wrap(seg.asReadOnly())); } @Override @@ -379,7 +379,7 @@ boolean isEmpty() { * Checks Ordered and Compact flags for integrity between sketch and its MemorySegment * @param sketch the given sketch */ - private static final void checkSketchAndMemorySegmentFlags(final Sketch sketch) { + private static final void checkSketchAndMemorySegmentFlags(final ThetaSketch sketch) { final MemorySegment seg = sketch.getMemorySegment(); if (seg == null) { return; } final int flags = PreambleUtil.extractFlags(seg); diff --git a/src/main/java/org/apache/datasketches/theta/UpdateSketch.java b/src/main/java/org/apache/datasketches/theta/UpdateSketch.java index 723d57a96..b02e8caf7 100644 --- a/src/main/java/org/apache/datasketches/theta/UpdateSketch.java +++ b/src/main/java/org/apache/datasketches/theta/UpdateSketch.java @@ -56,7 +56,7 @@ * * @author Lee Rhodes */ -public abstract class UpdateSketch extends Sketch { +public abstract class UpdateSketch extends ThetaSketch { private final long seed_; UpdateSketch(final long seed) { diff --git a/src/main/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInThetaSketchedSets.java b/src/main/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInThetaSketchedSets.java index b92b1d4d4..5337efc44 100644 --- a/src/main/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInThetaSketchedSets.java +++ b/src/main/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInThetaSketchedSets.java @@ -23,7 +23,7 @@ import org.apache.datasketches.common.BoundsOnRatiosInSampledSets; import org.apache.datasketches.common.SketchesArgumentException; -import org.apache.datasketches.theta.Sketch; +import org.apache.datasketches.theta.ThetaSketch; /** * This class is used to compute the bounds on the estimate of the ratio B / A, where: @@ -56,7 +56,7 @@ private BoundsOnRatiosInThetaSketchedSets() {} * @param sketchB the sketch B * @return the approximate lower bound for B over A */ - public static double getLowerBoundForBoverA(final Sketch sketchA, final Sketch sketchB) { + public static double getLowerBoundForBoverA(final ThetaSketch sketchA, final ThetaSketch sketchB) { final long thetaLongA = sketchA.getThetaLong(); final long thetaLongB = sketchB.getThetaLong(); checkThetas(thetaLongA, thetaLongB); @@ -77,7 +77,7 @@ public static double getLowerBoundForBoverA(final Sketch sketchA, final Sketch s * @param sketchB the sketch B * @return the approximate upper bound for B over A */ - public static double getUpperBoundForBoverA(final Sketch sketchA, final Sketch sketchB) { + public static double getUpperBoundForBoverA(final ThetaSketch sketchA, final ThetaSketch sketchB) { final long thetaLongA = sketchA.getThetaLong(); final long thetaLongB = sketchB.getThetaLong(); checkThetas(thetaLongA, thetaLongB); @@ -98,7 +98,7 @@ public static double getUpperBoundForBoverA(final Sketch sketchA, final Sketch s * @param sketchB the sketch B * @return the estimate for B over A */ - public static double getEstimateOfBoverA(final Sketch sketchA, final Sketch sketchB) { + public static double getEstimateOfBoverA(final ThetaSketch sketchA, final ThetaSketch sketchB) { final long thetaLongA = sketchA.getThetaLong(); final long thetaLongB = sketchB.getThetaLong(); checkThetas(thetaLongA, thetaLongB); diff --git a/src/main/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSets.java b/src/main/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSets.java index 49391fdb8..81e677687 100644 --- a/src/main/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSets.java +++ b/src/main/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSets.java @@ -85,7 +85,7 @@ public static double getLowerBoundForBoverA( */ public static double getLowerBoundForBoverA( final Sketch sketchA, - final org.apache.datasketches.theta.Sketch sketchB) { + final org.apache.datasketches.theta.ThetaSketch sketchB) { final long thetaLongA = sketchA.getThetaLong(); final long thetaLongB = sketchB.getThetaLong(); checkThetas(thetaLongA, thetaLongB); @@ -133,7 +133,7 @@ public static double getUpperBoundForBoverA( */ public static double getUpperBoundForBoverA( final Sketch sketchA, - final org.apache.datasketches.theta.Sketch sketchB) { + final org.apache.datasketches.theta.ThetaSketch sketchB) { final long thetaLongA = sketchA.getThetaLong(); final long thetaLongB = sketchB.getThetaLong(); checkThetas(thetaLongA, thetaLongB); @@ -181,7 +181,7 @@ public static double getEstimateOfBoverA( */ public static double getEstimateOfBoverA( final Sketch sketchA, - final org.apache.datasketches.theta.Sketch sketchB) { + final org.apache.datasketches.theta.ThetaSketch sketchB) { final long thetaLongA = sketchA.getThetaLong(); final long thetaLongB = sketchB.getThetaLong(); checkThetas(thetaLongA, thetaLongB); diff --git a/src/main/java/org/apache/datasketches/tuple/AnotB.java b/src/main/java/org/apache/datasketches/tuple/AnotB.java index a6d33a7e6..75c80a8d8 100644 --- a/src/main/java/org/apache/datasketches/tuple/AnotB.java +++ b/src/main/java/org/apache/datasketches/tuple/AnotB.java @@ -78,7 +78,7 @@ public final class AnotB { static { try { - GET_CACHE = org.apache.datasketches.theta.Sketch.class.getDeclaredMethod("getCache"); + GET_CACHE = org.apache.datasketches.theta.ThetaSketch.class.getDeclaredMethod("getCache"); GET_CACHE.setAccessible(true); } catch (final Exception e) { throw new SketchesStateException("Could not reflect getCache(): " + e); @@ -199,7 +199,7 @@ public void notB(final Sketch skB) { * second (or n+1th) argument B of A-AND-NOT-B. * Performs an AND NOT operation with the existing internal state of this AnotB operator. * Calls to this method can be intermingled with calls to - * {@link #notB(org.apache.datasketches.theta.Sketch)}. + * {@link #notB(org.apache.datasketches.theta.ThetaSketch)}. * *

An input argument of null or empty is ignored.

* @@ -213,7 +213,7 @@ public void notB(final Sketch skB) { * * @param skB The incoming Theta sketch for the second (or following) argument B. */ - public void notB(final org.apache.datasketches.theta.Sketch skB) { + public void notB(final org.apache.datasketches.theta.ThetaSketch skB) { if (skB == null) { return; } //ignore final long thetaLongB = skB.getThetaLong(); @@ -268,7 +268,7 @@ public void notB(final org.apache.datasketches.theta.Sketch skB) { /** * Gets the result of the multistep, stateful operation AnotB that have been executed with calls * to {@link #setA(Sketch)} and ({@link #notB(Sketch)} or - * {@link #notB(org.apache.datasketches.theta.Sketch)}). + * {@link #notB(org.apache.datasketches.theta.ThetaSketch)}). * * @param reset If true, clears this operator to the empty state after this result is * returned. Set this to false if you wish to obtain an intermediate result. @@ -291,7 +291,7 @@ public CompactSketch getResult(final boolean reset) { * *

This a stateless operation and has no impact on the internal state of this operator. * Thus, this is not an accumulating update and is independent of the {@link #setA(Sketch)}, - * {@link #notB(Sketch)}, {@link #notB(org.apache.datasketches.theta.Sketch)}, and + * {@link #notB(Sketch)}, {@link #notB(org.apache.datasketches.theta.ThetaSketch)}, and * {@link #getResult(boolean)} methods.

* *

If either argument is null an exception is thrown.

@@ -383,7 +383,7 @@ public static CompactSketch aNotB( * *

This a stateless operation and has no impact on the internal state of this operator. * Thus, this is not an accumulating update and is independent of the {@link #setA(Sketch)}, - * {@link #notB(Sketch)}, {@link #notB(org.apache.datasketches.theta.Sketch)}, and + * {@link #notB(Sketch)}, {@link #notB(org.apache.datasketches.theta.ThetaSketch)}, and * {@link #getResult(boolean)} methods.

* *

If either argument is null an exception is thrown.

@@ -406,7 +406,7 @@ public static CompactSketch aNotB( justification = "hashArr and summaryArr are guaranteed to be valid due to the switch on CornerCase") public static CompactSketch aNotB( final Sketch skA, - final org.apache.datasketches.theta.Sketch skB) { + final org.apache.datasketches.theta.ThetaSketch skB) { if (skA == null || skB == null) { throw new SketchesArgumentException("Neither argument may be null for this stateless operation."); } @@ -553,7 +553,7 @@ private static DataArrays getCopyOfResultArraysTheta( final int countA, final long[] hashArrA, final S[] summaryArrA, - final org.apache.datasketches.theta.Sketch skB) { + final org.apache.datasketches.theta.ThetaSketch skB) { final DataArrays daB = new DataArrays<>(); //Rebuild/get hashtable of skB diff --git a/src/main/java/org/apache/datasketches/tuple/HashTables.java b/src/main/java/org/apache/datasketches/tuple/HashTables.java index bd42f4980..419b3dad6 100644 --- a/src/main/java/org/apache/datasketches/tuple/HashTables.java +++ b/src/main/java/org/apache/datasketches/tuple/HashTables.java @@ -58,7 +58,7 @@ void fromSketch(final Sketch sketch) { } //must have valid entries - void fromSketch(final org.apache.datasketches.theta.Sketch sketch, final S summary) { + void fromSketch(final org.apache.datasketches.theta.ThetaSketch sketch, final S summary) { numKeys = sketch.getRetainedEntries(true); lgTableSize = getLgTableSize(numKeys); @@ -123,7 +123,7 @@ HashTables getIntersectHashTables( //For Theta Sketches HashTables getIntersectHashTables( - final org.apache.datasketches.theta.Sketch nextThetaSketch, + final org.apache.datasketches.theta.ThetaSketch nextThetaSketch, final long thetaLong, final SummarySetOperations summarySetOps, final S summary) { diff --git a/src/main/java/org/apache/datasketches/tuple/Intersection.java b/src/main/java/org/apache/datasketches/tuple/Intersection.java index b6f53249a..6467ad055 100644 --- a/src/main/java/org/apache/datasketches/tuple/Intersection.java +++ b/src/main/java/org/apache/datasketches/tuple/Intersection.java @@ -89,7 +89,7 @@ public CompactSketch intersect( */ public CompactSketch intersect( final Sketch tupleSketch, - final org.apache.datasketches.theta.Sketch + final org.apache.datasketches.theta.ThetaSketch thetaSketch, final S summary) { reset(); intersect(tupleSketch); @@ -148,7 +148,7 @@ public void intersect(final Sketch tupleSketch) { * @param summary the given proxy summary for the theta sketch, which doesn't have one. * It will be copied for each matching index. It must not be null. */ - public void intersect(final org.apache.datasketches.theta.Sketch thetaSketch, final S summary) { + public void intersect(final org.apache.datasketches.theta.ThetaSketch thetaSketch, final S summary) { if (thetaSketch == null) { throw new SketchesArgumentException("Sketch must not be null"); } if (summary == null) { throw new SketchesArgumentException("Summary cannot be null."); } final boolean firstCall = firstCall_; @@ -173,7 +173,7 @@ public void intersect(final org.apache.datasketches.theta.Sketch thetaSketch, fi // input sketch will have valid entries > 0 if (firstCall) { - final org.apache.datasketches.theta.Sketch firstSketch = thetaSketch; + final org.apache.datasketches.theta.ThetaSketch firstSketch = thetaSketch; //Copy firstSketch data into local instance hashTables_ hashTables_.fromSketch(firstSketch, summary); } diff --git a/src/main/java/org/apache/datasketches/tuple/JaccardSimilarity.java b/src/main/java/org/apache/datasketches/tuple/JaccardSimilarity.java index 73c6c7fe0..2a57a16a5 100644 --- a/src/main/java/org/apache/datasketches/tuple/JaccardSimilarity.java +++ b/src/main/java/org/apache/datasketches/tuple/JaccardSimilarity.java @@ -125,7 +125,7 @@ public static double[] jaccard( */ public static double[] jaccard( final Sketch sketchA, - final org.apache.datasketches.theta.Sketch sketchB, + final org.apache.datasketches.theta.ThetaSketch sketchB, final S summary, final SummarySetOperations summarySetOps) { // Null case checks if (summary == null) { @@ -227,7 +227,7 @@ public static boolean exactlyEqual( */ public static boolean exactlyEqual( final Sketch sketchA, - final org.apache.datasketches.theta.Sketch sketchB, + final org.apache.datasketches.theta.ThetaSketch sketchB, final S summary, final SummarySetOperations summarySetOps) { // Null case checks if (summary == null) { @@ -303,7 +303,7 @@ public static boolean similarityTest( * with at least 97.7% confidence. */ public static boolean similarityTest( - final Sketch measured, final org.apache.datasketches.theta.Sketch expected, + final Sketch measured, final org.apache.datasketches.theta.ThetaSketch expected, final S summary, final SummarySetOperations summarySetOps, final double threshold) { //index 0: the lower bound @@ -357,7 +357,7 @@ public static boolean dissimilarityTest( * with at least 97.7% confidence. */ public static boolean dissimilarityTest( - final Sketch measured, final org.apache.datasketches.theta.Sketch expected, + final Sketch measured, final org.apache.datasketches.theta.ThetaSketch expected, final S summary, final SummarySetOperations summarySetOps, final double threshold) { //index 0: the lower bound diff --git a/src/main/java/org/apache/datasketches/tuple/Union.java b/src/main/java/org/apache/datasketches/tuple/Union.java index f67626d1b..9c663f88a 100644 --- a/src/main/java/org/apache/datasketches/tuple/Union.java +++ b/src/main/java/org/apache/datasketches/tuple/Union.java @@ -89,7 +89,7 @@ public CompactSketch union(final Sketch tupleSketchA, final Sketch tupl * @return the result ordered CompactSketch on the heap. */ public CompactSketch union(final Sketch tupleSketch, - final org.apache.datasketches.theta.Sketch thetaSketch, final S summary) { + final org.apache.datasketches.theta.ThetaSketch thetaSketch, final S summary) { reset(); union(tupleSketch); union(thetaSketch, summary); @@ -120,7 +120,7 @@ public void union(final Sketch tupleSketch) { * @param summary the given proxy summary for the theta sketch, which doesn't have one. This may * not be null. */ - public void union(final org.apache.datasketches.theta.Sketch thetaSketch, final S summary) { + public void union(final org.apache.datasketches.theta.ThetaSketch thetaSketch, final S summary) { if (summary == null) { throw new SketchesArgumentException("Summary cannot be null."); } if (thetaSketch == null || thetaSketch.isEmpty()) { return; } diff --git a/src/test/java/org/apache/datasketches/theta/AnotBimplTest.java b/src/test/java/org/apache/datasketches/theta/AnotBimplTest.java index 6482712e8..6960fbc32 100644 --- a/src/test/java/org/apache/datasketches/theta/AnotBimplTest.java +++ b/src/test/java/org/apache/datasketches/theta/AnotBimplTest.java @@ -215,7 +215,7 @@ public void checkAnotBnotC() { final UpdateSketch cU = UpdateSketch.builder().setNominalEntries(k).build(); for (int i=k/2; i<3*k/4; i++) { cU.update(i); } //third 256 - final int segBytes = Sketch.getMaxUpdateSketchBytes(k); + final int segBytes = ThetaSketch.getMaxUpdateSketchBytes(k); CompactSketch result1, result2, result3; final MemorySegment wseg1 = MemorySegment.ofArray(new byte[segBytes]); @@ -259,7 +259,7 @@ public void checkAnotBnotC_sameMemorySegment() { final UpdateSketch c = UpdateSketch.builder().setNominalEntries(k).build(); for (int i=k/2; i<3*k/4; i++) { c.update(i); } //third 256 - final int segBytes = Sketch.getMaxCompactSketchBytes(a.getRetainedEntries(true)); + final int segBytes = ThetaSketch.getMaxCompactSketchBytes(a.getRetainedEntries(true)); final MemorySegment seg = MemorySegment.ofArray(new byte[segBytes]); CompactSketch result1, result2; diff --git a/src/test/java/org/apache/datasketches/theta/CompactSketchTest.java b/src/test/java/org/apache/datasketches/theta/CompactSketchTest.java index fc35891b3..4b2feb1bc 100644 --- a/src/test/java/org/apache/datasketches/theta/CompactSketchTest.java +++ b/src/test/java/org/apache/datasketches/theta/CompactSketchTest.java @@ -63,14 +63,14 @@ public void checkHeapifyWrap(final int k, final int u, final boolean ordered) { CompactSketch refSk = usk.compact(ordered, null); final byte[] barr = refSk.toByteArray(); final MemorySegment srcSeg = MemorySegment.ofArray(barr); - CompactSketch testSk = (CompactSketch) Sketch.heapify(srcSeg); + CompactSketch testSk = (CompactSketch) ThetaSketch.heapify(srcSeg); checkByRange(refSk, testSk, u, ordered); /**Via byte[]**/ final byte[] byteArray = refSk.toByteArray(); final MemorySegment heapROSeg = MemorySegment.ofArray(byteArray).asReadOnly(); - testSk = (CompactSketch)Sketch.heapify(heapROSeg); + testSk = (CompactSketch)ThetaSketch.heapify(heapROSeg); checkByRange(refSk, testSk, u, ordered); @@ -83,19 +83,19 @@ public void checkHeapifyWrap(final int k, final int u, final boolean ordered) { /**Via CompactSketch.compact**/ refSk = usk.compact(ordered, directSeg); - testSk = (CompactSketch)Sketch.wrap(directSeg); + testSk = (CompactSketch)ThetaSketch.wrap(directSeg); checkByRange(refSk, testSk, u, ordered); /**Via CompactSketch.compact**/ - testSk = (CompactSketch)Sketch.wrap(directSeg); + testSk = (CompactSketch)ThetaSketch.wrap(directSeg); checkByRange(refSk, testSk, u, ordered); } catch (final Exception e) { throw new RuntimeException(e); } } - private static void checkByRange(final Sketch refSk, final Sketch testSk, final int u, final boolean ordered) { + private static void checkByRange(final ThetaSketch refSk, final ThetaSketch testSk, final int u, final boolean ordered) { if (u == 0) { checkEmptySketch(testSk); } else if (u == 1) { @@ -105,7 +105,7 @@ private static void checkByRange(final Sketch refSk, final Sketch testSk, final } } - private static void checkEmptySketch(final Sketch testSk) { + private static void checkEmptySketch(final ThetaSketch testSk) { assertEquals(testSk.getFamily(), Family.COMPACT); assertTrue(testSk instanceof EmptyCompactSketch); assertTrue(testSk.isEmpty()); @@ -123,7 +123,7 @@ private static void checkEmptySketch(final Sketch testSk) { assertEquals(testSk.getCompactPreambleLongs(), 1); } - private static void checkSingleItemSketch(final Sketch testSk, final Sketch refSk) { + private static void checkSingleItemSketch(final ThetaSketch testSk, final ThetaSketch refSk) { assertEquals(testSk.getFamily(), Family.COMPACT); assertTrue(testSk instanceof SingleItemSketch); assertFalse(testSk.isEmpty()); @@ -141,7 +141,7 @@ private static void checkSingleItemSketch(final Sketch testSk, final Sketch refS assertEquals(testSk.getCompactPreambleLongs(), 1); } - private static void checkOtherCompactSketch(final Sketch testSk, final Sketch refSk, final boolean ordered) { + private static void checkOtherCompactSketch(final ThetaSketch testSk, final ThetaSketch refSk, final boolean ordered) { assertEquals(testSk.getFamily(), Family.COMPACT); assertFalse(testSk.isEmpty()); assertNotNull(testSk.iterator()); @@ -179,7 +179,7 @@ public void checkDirectSingleItemSketch() { final int bytes = sk.getCompactBytes(); final MemorySegment wseg = MemorySegment.ofArray(new byte[bytes]); sk.compact(true, wseg); - final Sketch csk2 = Sketch.heapify(wseg); + final ThetaSketch csk2 = ThetaSketch.heapify(wseg); assertTrue(csk2 instanceof SingleItemSketch); } @@ -443,10 +443,10 @@ public void checkMultipleItemHeapCompactSketch() { public void checkHeapifySingleItemSketch() { final UpdateSketch sk = UpdateSketch.builder().build(); sk.update(1); - final int bytes = Sketch.getMaxCompactSketchBytes(2); //1 more than needed + final int bytes = ThetaSketch.getMaxCompactSketchBytes(2); //1 more than needed final MemorySegment wseg = MemorySegment.ofArray(new byte[bytes]); sk.compact(false, wseg); - final Sketch csk = Sketch.heapify(wseg); + final ThetaSketch csk = ThetaSketch.heapify(wseg); assertTrue(csk instanceof SingleItemSketch); } @@ -456,7 +456,7 @@ public void checkHeapifyEmptySketch() { final MemorySegment wseg = MemorySegment.ofArray(new byte[16]); //empty, but extra bytes final CompactSketch csk = sk.compact(false, wseg); //ignores order because it is empty assertTrue(csk instanceof DirectCompactSketch); - final Sketch csk2 = Sketch.heapify(wseg); + final ThetaSketch csk2 = ThetaSketch.heapify(wseg); assertTrue(csk2 instanceof EmptyCompactSketch); } diff --git a/src/test/java/org/apache/datasketches/theta/ConcurrentDirectQuickSelectSketchTest.java b/src/test/java/org/apache/datasketches/theta/ConcurrentDirectQuickSelectSketchTest.java index e0816b0e5..f12d5809e 100644 --- a/src/test/java/org/apache/datasketches/theta/ConcurrentDirectQuickSelectSketchTest.java +++ b/src/test/java/org/apache/datasketches/theta/ConcurrentDirectQuickSelectSketchTest.java @@ -101,10 +101,10 @@ public void checkHeapifyByteArrayExact() { final byte[] serArr = shared.toByteArray(); final MemorySegment srcSeg = MemorySegment.ofArray(serArr).asReadOnly(); - final Sketch recoveredShared = Sketch.heapify(srcSeg); + final ThetaSketch recoveredShared = ThetaSketch.heapify(srcSeg); //reconstruct to Native/Direct - final int bytes = Sketch.getMaxUpdateSketchBytes(k); + final int bytes = ThetaSketch.getMaxUpdateSketchBytes(k); final MemorySegment wseg = MemorySegment.ofArray(new byte[bytes]); shared = sl.bldr.buildSharedFromSketch((UpdateSketch)recoveredShared, wseg); final UpdateSketch local2 = sl.bldr.buildLocal(shared); @@ -143,10 +143,10 @@ public void checkHeapifyByteArrayEstimating() { final byte[] serArr = shared.toByteArray(); final MemorySegment srcSeg = MemorySegment.ofArray(serArr).asReadOnly(); - final Sketch recoveredShared = Sketch.heapify(srcSeg); + final ThetaSketch recoveredShared = ThetaSketch.heapify(srcSeg); //reconstruct to Native/Direct - final int bytes = Sketch.getMaxUpdateSketchBytes(k); + final int bytes = ThetaSketch.getMaxUpdateSketchBytes(k); final MemorySegment wseg = MemorySegment.ofArray(new byte[bytes]); shared = sl.bldr.buildSharedFromSketch((UpdateSketch)recoveredShared, wseg); final UpdateSketch local2 = sl.bldr.buildLocal(shared); @@ -179,7 +179,7 @@ public void checkWrapMemorySegmentEst() { final double sk1ub = local.getUpperBound(2); assertTrue(local.isEstimationMode()); - final Sketch local2 = Sketch.wrap(sl.wseg); + final ThetaSketch local2 = ThetaSketch.wrap(sl.wseg); assertEquals(local2.getEstimate(), sk1est); assertEquals(local2.getLowerBound(2), sk1lb); @@ -503,7 +503,7 @@ public void checkConstructReconstructFromMemorySegment() { final UpdateSketch recoveredShared = UpdateSketch.wrap(seg); //reconstruct to Native/Direct - final int bytes = Sketch.getMaxUpdateSketchBytes(k); + final int bytes = ThetaSketch.getMaxUpdateSketchBytes(k); final MemorySegment wseg = MemorySegment.ofArray(new byte[bytes]); shared = sl.bldr.buildSharedFromSketch(recoveredShared, wseg); final UpdateSketch local2 = sl.bldr.buildLocal(shared); @@ -558,7 +558,7 @@ public void checkHeapifyIllegalFamilyID_heapify() { final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg); sl.wseg.set(JAVA_BYTE, FAMILY_BYTE, (byte) 0); //corrupt the Family ID byte //try to heapify the corrupted seg - Sketch.heapify(sl.wseg); //catch in Sketch.constructHeapSketch + ThetaSketch.heapify(sl.wseg); //catch in Sketch.constructHeapSketch } @Test(expectedExceptions = SketchesArgumentException.class) @@ -627,7 +627,7 @@ public void checkBadSerVer() { assertEquals(shared.getRetainedEntries(false), k); sl.wseg.set(JAVA_BYTE, SER_VER_BYTE, (byte) 0); //corrupt the SerVer byte - Sketch.wrap(sl.wseg); + ThetaSketch.wrap(sl.wseg); } @Test(expectedExceptions = SketchesArgumentException.class) @@ -638,7 +638,7 @@ public void checkWrapIllegalFamilyID_wrap() { sl.wseg.set(JAVA_BYTE, FAMILY_BYTE, (byte) 0); //corrupt the Sketch ID byte //try to wrap the corrupted seg - Sketch.wrap(sl.wseg); //catch in Sketch.constructDirectSketch + ThetaSketch.wrap(sl.wseg); //catch in Sketch.constructDirectSketch } @Test(expectedExceptions = SketchesArgumentException.class) @@ -662,7 +662,7 @@ public void checkHeapifySeedConflict() { final UpdateSketch shared = sl.shared; final MemorySegment srcSeg = MemorySegment.ofArray(shared.toByteArray()).asReadOnly(); - Sketch.heapify(srcSeg, seed2); + ThetaSketch.heapify(srcSeg, seed2); } @Test(expectedExceptions = SketchesArgumentException.class) @@ -672,7 +672,7 @@ public void checkCorruptLgNomLongs() { final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg); sl.wseg.set(JAVA_BYTE, LG_NOM_LONGS_BYTE, (byte)2); //corrupt - Sketch.heapify(sl.wseg, Util.DEFAULT_UPDATE_SEED); + ThetaSketch.heapify(sl.wseg, Util.DEFAULT_UPDATE_SEED); } @Test(expectedExceptions = UnsupportedOperationException.class) @@ -696,7 +696,7 @@ static void println(final String s) { //System.out.println(s); //disable here } - private static void checkMemorySegmentDirectProxyMethods(final Sketch local, final Sketch shared) { + private static void checkMemorySegmentDirectProxyMethods(final ThetaSketch local, final ThetaSketch shared) { assertEquals( local.hasMemorySegment(), shared.hasMemorySegment()); @@ -704,7 +704,7 @@ private static void checkMemorySegmentDirectProxyMethods(final Sketch local, fin } //Does not check hasMemorySegment(), isOffHeap() - private static void checkOtherProxyMethods(final Sketch local, final Sketch shared) { + private static void checkOtherProxyMethods(final ThetaSketch local, final ThetaSketch shared) { assertEquals(local.getCompactBytes(), shared.getCompactBytes()); assertEquals(local.getCurrentBytes(), shared.getCurrentBytes()); assertEquals(local.getEstimate(), shared.getEstimate()); diff --git a/src/test/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketchTest.java b/src/test/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketchTest.java index c354fd344..e3f4e8823 100644 --- a/src/test/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketchTest.java +++ b/src/test/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketchTest.java @@ -64,11 +64,11 @@ public void checkBadSerVer() { final byte[] serArr = shared.toByteArray(); final MemorySegment seg = MemorySegment.ofArray(serArr); - final Sketch sk = Sketch.heapify(seg, sl.seed); + final ThetaSketch sk = ThetaSketch.heapify(seg, sl.seed); assertTrue(sk instanceof HeapQuickSelectSketch); //Intentional promotion to Parent seg.set(JAVA_BYTE, SER_VER_BYTE, (byte) 0); //corrupt the SerVer byte - Sketch.heapify(seg, sl.seed); + ThetaSketch.heapify(seg, sl.seed); } @Test @@ -115,7 +115,7 @@ public void checkIllegalSketchID_UpdateSketch() { seg.set(JAVA_BYTE, FAMILY_BYTE, (byte) 0); //corrupt the Sketch ID byte //try to heapify the corrupted seg - Sketch.heapify(seg, sl.seed); + ThetaSketch.heapify(seg, sl.seed); } @Test(expectedExceptions = SketchesArgumentException.class) @@ -126,7 +126,7 @@ public void checkHeapifySeedConflict() { final SharedLocal sl = new SharedLocal(lgK, lgK, seed); final byte[] byteArray = sl.shared.toByteArray(); final MemorySegment srcSeg = MemorySegment.ofArray(byteArray); - Sketch.heapify(srcSeg, seed2); + ThetaSketch.heapify(srcSeg, seed2); } @Test(expectedExceptions = SketchesArgumentException.class) @@ -136,7 +136,7 @@ public void checkHeapifyCorruptLgNomLongs() { final byte[] serArr = sl.shared.toByteArray(); final MemorySegment srcSeg = MemorySegment.ofArray(serArr); srcSeg.set(JAVA_BYTE, LG_NOM_LONGS_BYTE, (byte)2); //corrupt - Sketch.heapify(srcSeg, Util.DEFAULT_UPDATE_SEED); + ThetaSketch.heapify(srcSeg, Util.DEFAULT_UPDATE_SEED); } @Test(expectedExceptions = UnsupportedOperationException.class) @@ -162,10 +162,10 @@ public void checkHeapifyByteArrayExact() { final byte[] serArr = shared.toByteArray(); final MemorySegment srcSeg = MemorySegment.ofArray(serArr).asReadOnly(); - final Sketch recoveredShared = UpdateSketch.heapify(srcSeg); + final ThetaSketch recoveredShared = UpdateSketch.heapify(srcSeg); //reconstruct to Native/Direct - final int bytes = Sketch.getMaxUpdateSketchBytes(k); + final int bytes = ThetaSketch.getMaxUpdateSketchBytes(k); final MemorySegment wseg = MemorySegment.ofArray(new byte[bytes]); shared = sl.bldr.buildSharedFromSketch((UpdateSketch)recoveredShared, wseg); final UpdateSketch local2 = sl.bldr.buildLocal(shared); @@ -203,7 +203,7 @@ public void checkHeapifyByteArrayEstimating() { final MemorySegment srcSeg = MemorySegment.ofArray(serArr).asReadOnly(); final UpdateSketch recoveredShared = UpdateSketch.heapify(srcSeg, sl.seed); - final int bytes = Sketch.getMaxUpdateSketchBytes(k); + final int bytes = ThetaSketch.getMaxUpdateSketchBytes(k); final MemorySegment wseg = MemorySegment.ofArray(new byte[bytes]); shared = sl.bldr.buildSharedFromSketch(recoveredShared, wseg); final UpdateSketch local2 = sl.bldr.buildLocal(shared); @@ -242,7 +242,7 @@ public void checkHeapifyMemorySegmentEstimating() { final MemorySegment srcSeg = MemorySegment.ofArray(serArr).asReadOnly(); final UpdateSketch recoveredShared = UpdateSketch.heapify(srcSeg, Util.DEFAULT_UPDATE_SEED); - final int bytes = Sketch.getMaxUpdateSketchBytes(k); + final int bytes = ThetaSketch.getMaxUpdateSketchBytes(k); final MemorySegment wseg = MemorySegment.ofArray(new byte[bytes]); shared = sl.bldr.buildSharedFromSketch(recoveredShared, wseg); final UpdateSketch local2 = sl.bldr.buildLocal(shared); @@ -577,7 +577,7 @@ public void checkMinReqBytes() { final byte[] byteArray = sl.shared.toByteArray(); final byte[] badBytes = Arrays.copyOfRange(byteArray, 0, 24); //corrupt no. bytes final MemorySegment seg = MemorySegment.ofArray(badBytes).asReadOnly(); - Sketch.heapify(seg); + ThetaSketch.heapify(seg); } @Test(expectedExceptions = SketchesArgumentException.class) @@ -591,7 +591,7 @@ public void checkThetaAndLgArrLongs() { final MemorySegment seg = MemorySegment.ofArray(badArray); PreambleUtil.insertLgArrLongs(seg, 4); //corrupt PreambleUtil.insertThetaLong(seg, Long.MAX_VALUE / 2); //corrupt - Sketch.heapify(seg); + ThetaSketch.heapify(seg); } @Test diff --git a/src/test/java/org/apache/datasketches/theta/DirectQuickSelectSketchTest.java b/src/test/java/org/apache/datasketches/theta/DirectQuickSelectSketchTest.java index a06206ff5..7f3f79281 100644 --- a/src/test/java/org/apache/datasketches/theta/DirectQuickSelectSketchTest.java +++ b/src/test/java/org/apache/datasketches/theta/DirectQuickSelectSketchTest.java @@ -76,7 +76,7 @@ public void checkBadSerVer() { wseg.set(JAVA_BYTE, SER_VER_BYTE, (byte) 0); //corrupt the SerVer byte - Sketch.wrap(wseg); + ThetaSketch.wrap(wseg); } catch (final Exception e) { if (e instanceof SketchesArgumentException) {} else { throw new RuntimeException(e); } @@ -117,7 +117,7 @@ public void checkHeapifyIllegalFamilyID_heapify() { seg.set(JAVA_BYTE, FAMILY_BYTE, (byte) 0); //corrupt the Family ID byte //try to heapify the corrupted seg - Sketch.heapify(seg); //catch in Sketch.constructHeapSketch + ThetaSketch.heapify(seg); //catch in Sketch.constructHeapSketch } @Test @@ -173,7 +173,7 @@ public void checkWrapIllegalFamilyID_wrap() { seg.set(JAVA_BYTE, FAMILY_BYTE, (byte) 0); //corrupt the Sketch ID byte //try to wrap the corrupted seg - Sketch.wrap(seg); //catch in Sketch.constructDirectSketch + ThetaSketch.wrap(seg); //catch in Sketch.constructDirectSketch } @Test(expectedExceptions = SketchesArgumentException.class) @@ -200,7 +200,7 @@ public void checkHeapifySeedConflict() { final UpdateSketch usk = UpdateSketch.builder().setSeed(seed1).setNominalEntries(k).build(wseg); final byte[] byteArray = usk.toByteArray(); final MemorySegment srcSeg = MemorySegment.ofArray(byteArray); - Sketch.heapify(srcSeg, seed2); + ThetaSketch.heapify(srcSeg, seed2); } catch (final Exception e) { if (e instanceof SketchesArgumentException) {} else { throw new RuntimeException(e); } @@ -215,7 +215,7 @@ public void checkCorruptLgNomLongs() { final MemorySegment wseg = makeNativeMemorySegment(k, arena); UpdateSketch.builder().setNominalEntries(k).build(wseg); wseg.set(JAVA_BYTE, LG_NOM_LONGS_BYTE, (byte)2); //corrupt - Sketch.heapify(wseg, Util.DEFAULT_UPDATE_SEED); + ThetaSketch.heapify(wseg, Util.DEFAULT_UPDATE_SEED); } catch (final Exception e) { if (e instanceof SketchesArgumentException) {} else { throw new RuntimeException(e); } @@ -237,7 +237,7 @@ public void checkHeapifyByteArrayExact() { assertEquals(bytes, byteArray.length); final MemorySegment srcSeg = MemorySegment.ofArray(byteArray); - final Sketch usk2 = Sketch.heapify(srcSeg); + final ThetaSketch usk2 = ThetaSketch.heapify(srcSeg); assertEquals(usk2.getEstimate(), k, 0.0); assertEquals(usk2.getLowerBound(2), k, 0.0); assertEquals(usk2.getUpperBound(2), k, 0.0); @@ -271,7 +271,7 @@ public void checkHeapifyByteArrayEstimating() { final byte[] byteArray = usk.toByteArray(); final MemorySegment srcSeg = MemorySegment.ofArray(byteArray); - final Sketch usk2 = Sketch.heapify(srcSeg); + final ThetaSketch usk2 = ThetaSketch.heapify(srcSeg); assertEquals(usk2.getEstimate(), uskEst); assertEquals(usk2.getLowerBound(2), uskLB); assertEquals(usk2.getUpperBound(2), uskUB); @@ -297,7 +297,7 @@ public void checkWrapMemorySegmentEst() { final double sk1ub = sk1.getUpperBound(2); assertTrue(sk1.isEstimationMode()); - final Sketch sk2 = Sketch.wrap(wseg); + final ThetaSketch sk2 = ThetaSketch.wrap(wseg); assertEquals(sk2.getEstimate(), sk1est); assertEquals(sk2.getLowerBound(2), sk1lb); @@ -734,7 +734,7 @@ public void checkConstructReconstructFromMemorySegment() { @Test(expectedExceptions = SketchesReadOnlyException.class) public void updateAfterReadOnlyWrap() { final UpdateSketch usk1 = UpdateSketch.builder().build(); - final UpdateSketch usk2 = (UpdateSketch) Sketch.wrap(MemorySegment.ofArray(usk1.toByteArray())); + final UpdateSketch usk2 = (UpdateSketch) ThetaSketch.wrap(MemorySegment.ofArray(usk1.toByteArray())); usk2.update(0); } @@ -756,7 +756,7 @@ public void checkConstructorSrcSegCorruptions() { final int k = 1024; //lgNomLongs = 10 final int u = k; //exact mode, lgArrLongs = 11 - final int bytes = Sketch.getMaxUpdateSketchBytes(k); + final int bytes = ThetaSketch.getMaxUpdateSketchBytes(k); final byte[] arr1 = new byte[bytes]; final MemorySegment seg1 = MemorySegment.ofArray(arr1); final ResizeFactor rf = ResizeFactor.X1; //0 @@ -823,7 +823,7 @@ public void checkConstructorSrcSegCorruptions() { public void checkCorruptRFWithInsufficientArray() { final int k = 1024; //lgNomLongs = 10 - final int bytes = Sketch.getMaxUpdateSketchBytes(k); + final int bytes = ThetaSketch.getMaxUpdateSketchBytes(k); final byte[] arr = new byte[bytes]; final MemorySegment seg = MemorySegment.ofArray(arr); final ResizeFactor rf = ResizeFactor.X8; // 3 @@ -867,7 +867,7 @@ public void checkBadLgNomLongs() { public void checkMoveAndResize() { final int k = 1 << 12; final int u = 2 * k; - final int bytes = Sketch.getMaxUpdateSketchBytes(k); + final int bytes = ThetaSketch.getMaxUpdateSketchBytes(k); MemorySegment wseg; try (Arena arena = Arena.ofConfined()) { wseg = arena.allocate(bytes / 2); @@ -883,7 +883,7 @@ public void checkMoveAndResize() { public void checkReadOnlyRebuildResize() { final int k = 1 << 12; final int u = 2 * k; - final int bytes = Sketch.getMaxUpdateSketchBytes(k); + final int bytes = ThetaSketch.getMaxUpdateSketchBytes(k); MemorySegment wseg; try (Arena arena = Arena.ofConfined()) { wseg = arena.allocate(bytes / 2); @@ -892,7 +892,7 @@ public void checkReadOnlyRebuildResize() { final double est1 = sketch.getEstimate(); final byte[] serBytes = sketch.toByteArray(); final MemorySegment seg = MemorySegment.ofArray(serBytes).asReadOnly(); - final UpdateSketch roSketch = (UpdateSketch) Sketch.wrap(seg); + final UpdateSketch roSketch = (UpdateSketch) ThetaSketch.wrap(seg); final double est2 = roSketch.getEstimate(); assertEquals(est2, est1); try { diff --git a/src/test/java/org/apache/datasketches/theta/DirectUnionTest.java b/src/test/java/org/apache/datasketches/theta/DirectUnionTest.java index e83651aed..c488abcb4 100644 --- a/src/test/java/org/apache/datasketches/theta/DirectUnionTest.java +++ b/src/test/java/org/apache/datasketches/theta/DirectUnionTest.java @@ -435,8 +435,8 @@ public void checkDirectSegmentIn() { final MemorySegment skSeg1 = MemorySegment.ofArray(usk1.compact(false, null).toByteArray()).asReadOnly(); final MemorySegment skSeg2 = MemorySegment.ofArray(usk2.compact(true, null).toByteArray()).asReadOnly(); - final CompactSketch csk1 = (CompactSketch)Sketch.wrap(skSeg1); - final CompactSketch csk2 = (CompactSketch)Sketch.wrap(skSeg2); + final CompactSketch csk1 = (CompactSketch)ThetaSketch.wrap(skSeg1); + final CompactSketch csk2 = (CompactSketch)ThetaSketch.wrap(skSeg2); final MemorySegment uSeg = MemorySegment.ofArray(new byte[getMaxUnionBytes(k)]); //union segment final Union union = SetOperation.builder().setNominalEntries(k).buildUnion(uSeg); @@ -518,7 +518,7 @@ public void checkEmptyUnionCompactResult() { final MemorySegment uSeg = MemorySegment.ofArray(new byte[getMaxUnionBytes(k)]); //union segment final Union union = SetOperation.builder().setNominalEntries(k).buildUnion(uSeg); - final MemorySegment seg = MemorySegment.ofArray(new byte[Sketch.getMaxCompactSketchBytes(0)]); + final MemorySegment seg = MemorySegment.ofArray(new byte[ThetaSketch.getMaxCompactSketchBytes(0)]); final CompactSketch csk = union.getResult(false, seg); //DirectCompactSketch assertTrue(csk.isEmpty()); } @@ -530,7 +530,7 @@ public void checkEmptyUnionCompactOrderedResult() { final MemorySegment uSeg = MemorySegment.ofArray(new byte[getMaxUnionBytes(k)]); //union segment final Union union = SetOperation.builder().setNominalEntries(k).buildUnion(uSeg); - final MemorySegment seg = MemorySegment.ofArray(new byte[Sketch.getMaxCompactSketchBytes(0)]); + final MemorySegment seg = MemorySegment.ofArray(new byte[ThetaSketch.getMaxCompactSketchBytes(0)]); final CompactSketch csk = union.getResult(true, seg); //DirectCompactSketch assertTrue(csk.isEmpty()); } @@ -617,7 +617,7 @@ public void checkPreambleLongsCorruption() { final SetOperation setOp = new SetOperationBuilder().setNominalEntries(k).build(Family.UNION, seg); println(setOp.toString()); final int familyID = PreambleUtil.extractFamilyID(seg); - final int preLongs = Sketch.getPreambleLongs(seg); + final int preLongs = ThetaSketch.getPreambleLongs(seg); assertEquals(familyID, Family.UNION.getID()); assertEquals(preLongs, Family.UNION.getMaxPreLongs()); PreambleUtil.insertPreLongs(seg, 3); //Corrupt with 3; correct value is 4 @@ -644,7 +644,7 @@ public void checkForDruidBug() { } usk.rebuild(); //optional but created the symptom - final Sketch s = usk.compact(); + final ThetaSketch s = usk.compact(); //create empty target union in off-heap segment final MemorySegment seg = MemorySegment.ofArray(new byte[getMaxUnionBytes(k)]); diff --git a/src/test/java/org/apache/datasketches/theta/HeapAlphaSketchTest.java b/src/test/java/org/apache/datasketches/theta/HeapAlphaSketchTest.java index 31f1992c1..38fc8f629 100644 --- a/src/test/java/org/apache/datasketches/theta/HeapAlphaSketchTest.java +++ b/src/test/java/org/apache/datasketches/theta/HeapAlphaSketchTest.java @@ -78,7 +78,7 @@ public void checkBadSerVer() { MemorySegment seg = MemorySegment.ofArray(byteArray); seg.set(JAVA_BYTE, SER_VER_BYTE, (byte) 0); //corrupt the SerVer byte - Sketch.heapify(seg, seed); + ThetaSketch.heapify(seg, seed); } @Test(expectedExceptions = SketchesArgumentException.class) @@ -115,7 +115,7 @@ public void checkIllegalSketchID_UpdateSketch() { seg.set(JAVA_BYTE, FAMILY_BYTE, (byte) 0); //corrupt the Sketch ID byte //try to heapify the corrupted seg - Sketch.heapify(seg, seed); + ThetaSketch.heapify(seg, seed); } @Test(expectedExceptions = SketchesArgumentException.class) @@ -127,7 +127,7 @@ public void checkHeapifySeedConflict() { .setNominalEntries(k).build(); byte[] byteArray = usk.toByteArray(); MemorySegment srcSeg = MemorySegment.ofArray(byteArray).asReadOnly(); - Sketch.heapify(srcSeg, seed2); + ThetaSketch.heapify(srcSeg, seed2); } @Test @@ -147,7 +147,7 @@ public void checkHeapifyByteArrayExact() { assertEquals(bytes, byteArray.length); MemorySegment srcSeg = MemorySegment.ofArray(byteArray); - UpdateSketch usk2 = (UpdateSketch)Sketch.heapify(srcSeg, seed); + UpdateSketch usk2 = (UpdateSketch)ThetaSketch.heapify(srcSeg, seed); assertEquals(usk2.getEstimate(), u, 0.0); assertEquals(usk2.getLowerBound(2), u, 0.0); assertEquals(usk2.getUpperBound(2), u, 0.0); @@ -177,7 +177,7 @@ public void checkHeapifyByteArrayEstimating() { byte[] byteArray = usk.toByteArray(); MemorySegment srcSeg = MemorySegment.ofArray(byteArray).asReadOnly(); - UpdateSketch usk2 = (UpdateSketch)Sketch.heapify(srcSeg, seed); + UpdateSketch usk2 = (UpdateSketch)ThetaSketch.heapify(srcSeg, seed); assertEquals(usk2.getEstimate(), uskEst); assertEquals(usk2.getLowerBound(2), uskLB); assertEquals(usk2.getUpperBound(2), uskUB); @@ -208,7 +208,7 @@ public void checkHeapifyMemorySegmentEstimating() { byte[] byteArray = sk1.toByteArray(); MemorySegment seg = MemorySegment.ofArray(byteArray).asReadOnly(); - UpdateSketch sk2 = (UpdateSketch)Sketch.heapify(seg, Util.DEFAULT_UPDATE_SEED); + UpdateSketch sk2 = (UpdateSketch)ThetaSketch.heapify(seg, Util.DEFAULT_UPDATE_SEED); assertEquals(sk2.getEstimate(), sk1est); assertEquals(sk2.getLowerBound(2), sk1lb); @@ -545,40 +545,40 @@ public void checkResetAndStartingSubMultiple() { @Test(expectedExceptions = SketchesArgumentException.class) public void checkLBlimits0() { int k = 512; - Sketch alpha = UpdateSketch.builder().setFamily(ALPHA).setNominalEntries(k).build(); + ThetaSketch alpha = UpdateSketch.builder().setFamily(ALPHA).setNominalEntries(k).build(); alpha.getLowerBound(0); } @Test(expectedExceptions = SketchesArgumentException.class) public void checkUBlimits0() { int k = 512; - Sketch alpha = UpdateSketch.builder().setFamily(ALPHA).setNominalEntries(k).build(); + ThetaSketch alpha = UpdateSketch.builder().setFamily(ALPHA).setNominalEntries(k).build(); alpha.getUpperBound(0); } @Test(expectedExceptions = SketchesArgumentException.class) public void checkLBlimits4() { int k = 512; - Sketch alpha = UpdateSketch.builder().setFamily(ALPHA).setNominalEntries(k).build(); + ThetaSketch alpha = UpdateSketch.builder().setFamily(ALPHA).setNominalEntries(k).build(); alpha.getLowerBound(4); } @Test(expectedExceptions = SketchesArgumentException.class) public void checkUBlimits4() { int k = 512; - Sketch alpha = UpdateSketch.builder().setFamily(ALPHA).setNominalEntries(k).build(); + ThetaSketch alpha = UpdateSketch.builder().setFamily(ALPHA).setNominalEntries(k).build(); alpha.getUpperBound(4); } @Test(expectedExceptions = SketchesArgumentException.class) public void checkBadPreambleLongs() { int k = 512; - Sketch alpha = UpdateSketch.builder().setFamily(ALPHA).setNominalEntries(k).build(); + ThetaSketch alpha = UpdateSketch.builder().setFamily(ALPHA).setNominalEntries(k).build(); byte[] byteArray = alpha.toByteArray(); MemorySegment seg = MemorySegment.ofArray(byteArray); //corrupt: seg.set(JAVA_BYTE, PREAMBLE_LONGS_BYTE, (byte) 4); - Sketch.heapify(seg); + ThetaSketch.heapify(seg); } @Test(expectedExceptions = SketchesArgumentException.class) diff --git a/src/test/java/org/apache/datasketches/theta/HeapQuickSelectSketchTest.java b/src/test/java/org/apache/datasketches/theta/HeapQuickSelectSketchTest.java index 1fd536128..dafd4e4fc 100644 --- a/src/test/java/org/apache/datasketches/theta/HeapQuickSelectSketchTest.java +++ b/src/test/java/org/apache/datasketches/theta/HeapQuickSelectSketchTest.java @@ -76,7 +76,7 @@ public void checkBadSerVer() { final MemorySegment seg = MemorySegment.ofArray(byteArray); seg.set(JAVA_BYTE, SER_VER_BYTE, (byte) 0); //corrupt the SerVer byte - Sketch.heapify(seg, seed); + ThetaSketch.heapify(seg, seed); } @Test(expectedExceptions = SketchesArgumentException.class) @@ -100,7 +100,7 @@ public void checkIllegalSketchID_UpdateSketch() { seg.set(JAVA_BYTE, FAMILY_BYTE, (byte) 0); //corrupt the Sketch ID byte //try to heapify the corrupted seg - Sketch.heapify(seg, seed); + ThetaSketch.heapify(seg, seed); } @Test(expectedExceptions = SketchesArgumentException.class) @@ -111,7 +111,7 @@ public void checkHeapifySeedConflict() { final UpdateSketch usk = UpdateSketch.builder().setFamily(fam_).setSeed(seed1).setNominalEntries(k).build(); final byte[] byteArray = usk.toByteArray(); final MemorySegment srcSeg = MemorySegment.ofArray(byteArray).asReadOnly(); - Sketch.heapify(srcSeg, seed2); + ThetaSketch.heapify(srcSeg, seed2); } @Test(expectedExceptions = SketchesArgumentException.class) @@ -119,7 +119,7 @@ public void checkHeapifyCorruptLgNomLongs() { final UpdateSketch usk = UpdateSketch.builder().setNominalEntries(16).build(); final MemorySegment srcSeg = MemorySegment.ofArray(usk.toByteArray()); srcSeg.set(JAVA_BYTE, LG_NOM_LONGS_BYTE, (byte)2); //corrupt - Sketch.heapify(srcSeg, Util.DEFAULT_UPDATE_SEED); + ThetaSketch.heapify(srcSeg, Util.DEFAULT_UPDATE_SEED); } @Test @@ -547,7 +547,7 @@ public void checkMinReqBytes() { final byte[] byteArray = s1.toByteArray(); final byte[] badBytes = Arrays.copyOfRange(byteArray, 0, 24); final MemorySegment seg = MemorySegment.ofArray(badBytes); - Sketch.heapify(seg); + ThetaSketch.heapify(seg); } @Test(expectedExceptions = SketchesArgumentException.class) @@ -559,7 +559,7 @@ public void checkThetaAndLgArrLongs() { final MemorySegment seg = MemorySegment.ofArray(badArray); PreambleUtil.insertLgArrLongs(seg, 4); PreambleUtil.insertThetaLong(seg, Long.MAX_VALUE / 2); - Sketch.heapify(seg); + ThetaSketch.heapify(seg); } @Test diff --git a/src/test/java/org/apache/datasketches/theta/HeapUnionTest.java b/src/test/java/org/apache/datasketches/theta/HeapUnionTest.java index 8863a971b..bc602a6f8 100644 --- a/src/test/java/org/apache/datasketches/theta/HeapUnionTest.java +++ b/src/test/java/org/apache/datasketches/theta/HeapUnionTest.java @@ -389,8 +389,8 @@ public void checkDirectSegmentIn() { final MemorySegment skSeg1 = MemorySegment.ofArray(usk1.compact(false, null).toByteArray()); final MemorySegment skSeg2 = MemorySegment.ofArray(usk2.compact(true, null).toByteArray()); - final CompactSketch csk1 = (CompactSketch)Sketch.wrap(skSeg1); - final CompactSketch csk2 = (CompactSketch)Sketch.wrap(skSeg2); + final CompactSketch csk1 = (CompactSketch)ThetaSketch.wrap(skSeg1); + final CompactSketch csk2 = (CompactSketch)ThetaSketch.wrap(skSeg2); final Union union = SetOperation.builder().setNominalEntries(k).buildUnion(); diff --git a/src/test/java/org/apache/datasketches/theta/HeapifyWrapSerVer3Test.java b/src/test/java/org/apache/datasketches/theta/HeapifyWrapSerVer3Test.java index b1dba552c..79e0252af 100644 --- a/src/test/java/org/apache/datasketches/theta/HeapifyWrapSerVer3Test.java +++ b/src/test/java/org/apache/datasketches/theta/HeapifyWrapSerVer3Test.java @@ -82,7 +82,7 @@ public void checkHeapifySketchAssumedDefaultSeed() { final MemorySegment cskSeg = MemorySegment.ofArray(csk.toByteArray()).asReadOnly(); CompactSketch cskResult; - cskResult = (CompactSketch) Sketch.heapify(cskSeg); + cskResult = (CompactSketch) ThetaSketch.heapify(cskSeg); assertEquals(cskResult.getEstimate(), usk.getEstimate()); assertEquals(cskResult.getSeedHash(), seedHash); } @@ -99,7 +99,7 @@ public void checkHeapifySketchDifferentSeed() { final MemorySegment cskSeg = MemorySegment.ofArray(csk.toByteArray()).asReadOnly(); CompactSketch cskResult; - cskResult = (CompactSketch) Sketch.heapify(cskSeg, seed); + cskResult = (CompactSketch) ThetaSketch.heapify(cskSeg, seed); assertEquals(cskResult.getEstimate(), usk.getEstimate()); assertEquals(cskResult.getSeedHash(), seedHash); } @@ -162,7 +162,7 @@ public void checkWrapSketchAssumedDefaultSeed() { //SerialVersion3 test try(Arena arena = Arena.ofConfined()) { offHeap = putOffHeap(MemorySegment.ofArray(csk.toByteArray()), arena); - cskResult = (CompactSketch) Sketch.wrap(offHeap); + cskResult = (CompactSketch) ThetaSketch.wrap(offHeap); assertEquals(cskResult.getEstimate(), usk.getEstimate()); assertEquals(cskResult.getSeedHash(), seedHash); assertTrue(cskResult.isOffHeap()); @@ -183,7 +183,7 @@ public void checkWrapSketchDifferentSeed() { //SerialVersion3 test try(Arena arena = Arena.ofConfined()) { offHeap = putOffHeap(MemorySegment.ofArray(csk.toByteArray()), arena); - cskResult = (CompactSketch) Sketch.wrap(offHeap, seed); + cskResult = (CompactSketch) ThetaSketch.wrap(offHeap, seed); assertEquals(cskResult.getEstimate(), usk.getEstimate()); assertEquals(cskResult.getSeedHash(), seedHash); assertTrue(cskResult.isOffHeap()); diff --git a/src/test/java/org/apache/datasketches/theta/IteratorTest.java b/src/test/java/org/apache/datasketches/theta/IteratorTest.java index 343142044..7e3dbd159 100644 --- a/src/test/java/org/apache/datasketches/theta/IteratorTest.java +++ b/src/test/java/org/apache/datasketches/theta/IteratorTest.java @@ -26,7 +26,7 @@ import org.apache.datasketches.common.Family; import org.apache.datasketches.theta.CompactSketch; import org.apache.datasketches.theta.HashIterator; -import org.apache.datasketches.theta.Sketch; +import org.apache.datasketches.theta.ThetaSketch; import org.apache.datasketches.theta.UpdateSketch; @@ -39,7 +39,7 @@ public class IteratorTest { @Test public void checkDirectCompactSketch() { int k = 16; - int maxBytes = Sketch.getMaxUpdateSketchBytes(k); + int maxBytes = ThetaSketch.getMaxUpdateSketchBytes(k); MemorySegment wseg = MemorySegment.ofArray(new byte[maxBytes]); UpdateSketch sk1 = UpdateSketch.builder().setNominalEntries(k).build(wseg); println(sk1.getClass().getSimpleName()); @@ -52,7 +52,7 @@ public void checkDirectCompactSketch() { assertEquals(count, k/2); println(""); - Sketch sk2 = sk1.compact(); + ThetaSketch sk2 = sk1.compact(); println(sk2.getClass().getSimpleName()); HashIterator itr2 = sk2.iterator(); count = 0; @@ -62,7 +62,7 @@ public void checkDirectCompactSketch() { assertEquals(count, k/2); println(""); - Sketch sk3 = sk1.compact(false, MemorySegment.ofArray(new byte[maxBytes])); + ThetaSketch sk3 = sk1.compact(false, MemorySegment.ofArray(new byte[maxBytes])); println(sk3.getClass().getSimpleName()); HashIterator itr3 = sk3.iterator(); count = 0; diff --git a/src/test/java/org/apache/datasketches/theta/PairwiseSetOperationsTest.java b/src/test/java/org/apache/datasketches/theta/PairwiseSetOperationsTest.java index 2d1e71103..e2682453a 100644 --- a/src/test/java/org/apache/datasketches/theta/PairwiseSetOperationsTest.java +++ b/src/test/java/org/apache/datasketches/theta/PairwiseSetOperationsTest.java @@ -27,7 +27,7 @@ import org.apache.datasketches.theta.CompactSketch; import org.apache.datasketches.theta.Intersection; import org.apache.datasketches.theta.SetOperation; -import org.apache.datasketches.theta.Sketch; +import org.apache.datasketches.theta.ThetaSketch; import org.apache.datasketches.theta.Union; import org.apache.datasketches.theta.UpdateSketch; import org.testng.annotations.Test; @@ -52,7 +52,7 @@ public void checkIntersectionNoOverlap() { CompactSketch csk1 = usk1.compact(true, null); CompactSketch csk2 = usk2.compact(true, null); Intersection inter = SetOperation.builder().buildIntersection(); - Sketch rsk = inter.intersect(csk1, csk2); + ThetaSketch rsk = inter.intersect(csk1, csk2); assertEquals(rsk.getEstimate(), 0.0); } @@ -73,7 +73,7 @@ public void checkIntersectionFullOverlap() { CompactSketch csk1 = usk1.compact(true, null); CompactSketch csk2 = usk2.compact(true, null); - Sketch rsk = inter.intersect(csk1, csk2); + ThetaSketch rsk = inter.intersect(csk1, csk2); assertEquals(rsk.getEstimate(), k, 0.0); } @@ -98,7 +98,7 @@ public void checkIntersectionEarlyStop() { CompactSketch csk1 = usk1.compact(true, null); CompactSketch csk2 = usk2.compact(true, null); - Sketch rsk = inter.intersect(csk1, csk2); + ThetaSketch rsk = inter.intersect(csk1, csk2); double result1 = rsk.getEstimate(); inter.intersect(csk1); @@ -133,7 +133,7 @@ public void checkAnotBNoOverlap() { CompactSketch csk1 = usk1.compact(true, null); CompactSketch csk2 = usk2.compact(true, null); - Sketch rsk = anotb.aNotB(csk1, csk2); + ThetaSketch rsk = anotb.aNotB(csk1, csk2); assertEquals(rsk.getEstimate(), k, 0.0); } @@ -154,7 +154,7 @@ public void checkAnotBFullOverlap() { CompactSketch csk1 = usk1.compact(true, null); CompactSketch csk2 = usk2.compact(true, null); - Sketch rsk = anotb.aNotB(csk1, csk2); + ThetaSketch rsk = anotb.aNotB(csk1, csk2); assertEquals(rsk.getEstimate(), 0.0, 0.0); } @@ -180,7 +180,7 @@ public void checkAnotBEarlyStop() { CompactSketch csk1 = usk1.compact(true, null); CompactSketch csk2 = usk2.compact(true, null); - Sketch rsk = aNotB.aNotB(csk1, csk2); + ThetaSketch rsk = aNotB.aNotB(csk1, csk2); double result1 = rsk.getEstimate(); CompactSketch csk3 = aNotB.aNotB(csk1, csk2); @@ -214,9 +214,9 @@ public void checkUnionNoOverlap() { union.union(csk1); union.union(csk2); - Sketch stdSk = union.getResult(true, null); + ThetaSketch stdSk = union.getResult(true, null); - Sketch rsk = union.union(csk1, csk2); + ThetaSketch rsk = union.union(csk1, csk2); assertEquals(rsk.getEstimate(), stdSk.getEstimate(), 0.0); } @@ -238,7 +238,7 @@ public void checkUnionFullOverlap() { CompactSketch csk1 = usk1.compact(true, null); CompactSketch csk2 = usk2.compact(true, null); - Sketch rsk = union.union(csk1, csk2); + ThetaSketch rsk = union.union(csk1, csk2); assertEquals(rsk.getEstimate(), k, 0.0); } @@ -264,7 +264,7 @@ public void checkUnionEarlyStop() { CompactSketch csk1 = usk1.compact(true, null); CompactSketch csk2 = usk2.compact(true, null); - Sketch pwSk = union.union(csk1, csk2); + ThetaSketch pwSk = union.union(csk1, csk2); double pwEst = pwSk.getEstimate(); union.union(csk1); @@ -298,7 +298,7 @@ public void checkUnionCutbackToK() { CompactSketch csk1 = usk1.compact(true, null); CompactSketch csk2 = usk2.compact(true, null); - Sketch pwSk = union.union(csk1, csk2); + ThetaSketch pwSk = union.union(csk1, csk2); double pwEst = pwSk.getEstimate(); union.union(csk1); diff --git a/src/test/java/org/apache/datasketches/theta/PreambleUtilTest.java b/src/test/java/org/apache/datasketches/theta/PreambleUtilTest.java index 61093c2a5..a17b6f64c 100644 --- a/src/test/java/org/apache/datasketches/theta/PreambleUtilTest.java +++ b/src/test/java/org/apache/datasketches/theta/PreambleUtilTest.java @@ -74,7 +74,7 @@ public void checkToString() { final MemorySegment seg = MemorySegment.ofArray(byteArray); final UpdateSketch quick1 = UpdateSketch.builder().setNominalEntries(k).build(seg); - println(Sketch.toString(byteArray)); + println(ThetaSketch.toString(byteArray)); Assert.assertTrue(quick1.isEmpty()); @@ -103,14 +103,14 @@ public void checkToStringWithPrelongsOf2() { quick1.update(i); } final byte[] bytes = quick1.compact().toByteArray(); - println(Sketch.toString(bytes)); + println(ThetaSketch.toString(bytes)); } @Test public void checkPreambleToStringExceptions() { byte[] byteArr = new byte[7]; try { //check preLongs < 8 fails - Sketch.toString(byteArr); + ThetaSketch.toString(byteArr); fail("Did not throw SketchesArgumentException."); } catch (final SketchesArgumentException e) { //expected @@ -118,7 +118,7 @@ public void checkPreambleToStringExceptions() { byteArr = new byte[8]; byteArr[0] = (byte) 2; //needs min capacity of 16 try { //check preLongs == 2 fails - Sketch.toString(MemorySegment.ofArray(byteArr).asReadOnly()); + ThetaSketch.toString(MemorySegment.ofArray(byteArr).asReadOnly()); fail("Did not throw SketchesArgumentException."); } catch (final SketchesArgumentException e) { //expected @@ -136,19 +136,19 @@ public void checkPreLongs() { final UpdateSketch sketch = UpdateSketch.builder().setNominalEntries(16).build(); CompactSketch comp = sketch.compact(false, null); byte[] byteArr = comp.toByteArray(); - println(Sketch.toString(byteArr)); //PreLongs = 1 + println(ThetaSketch.toString(byteArr)); //PreLongs = 1 sketch.update(1); comp = sketch.compact(false, null); byteArr = comp.toByteArray(); - println(Sketch.toString(byteArr)); //PreLongs = 2 + println(ThetaSketch.toString(byteArr)); //PreLongs = 2 for (int i=2; i<=32; i++) { sketch.update(i); } comp = sketch.compact(false, null); byteArr = comp.toByteArray(); - println(Sketch.toString(MemorySegment.ofArray(byteArr).asReadOnly())); //PreLongs = 3 + println(ThetaSketch.toString(MemorySegment.ofArray(byteArr).asReadOnly())); //PreLongs = 3 } @Test diff --git a/src/test/java/org/apache/datasketches/theta/ReadOnlyMemorySegmentTest.java b/src/test/java/org/apache/datasketches/theta/ReadOnlyMemorySegmentTest.java index ab6caf793..d196fc95b 100644 --- a/src/test/java/org/apache/datasketches/theta/ReadOnlyMemorySegmentTest.java +++ b/src/test/java/org/apache/datasketches/theta/ReadOnlyMemorySegmentTest.java @@ -39,7 +39,7 @@ public void wrapAndTryUpdatingUpdateSketch() { updateSketch.update(1); final MemorySegment seg = MemorySegment.ofBuffer( ByteBuffer.wrap(updateSketch.toByteArray()).asReadOnlyBuffer().order(ByteOrder.nativeOrder())); - final UpdateSketch sketch = (UpdateSketch) Sketch.wrap(seg); + final UpdateSketch sketch = (UpdateSketch) ThetaSketch.wrap(seg); assertEquals(sketch.getEstimate(), 1.0); assertTrue(seg.isReadOnly()); @@ -58,7 +58,7 @@ public void wrapCompactUnorderedSketch() { updateSketch.update(1); final MemorySegment seg = MemorySegment.ofBuffer( ByteBuffer.wrap(updateSketch.compact(false, null).toByteArray()).asReadOnlyBuffer().order(ByteOrder.nativeOrder())); - final Sketch sketch = Sketch.wrap(seg); + final ThetaSketch sketch = ThetaSketch.wrap(seg); assertEquals(sketch.getEstimate(), 1.0); assertTrue(seg.isReadOnly()); } @@ -69,7 +69,7 @@ public void wrapCompactOrderedSketch() { updateSketch.update(1); final MemorySegment seg = MemorySegment.ofBuffer(ByteBuffer.wrap(updateSketch.compact().toByteArray()) .asReadOnlyBuffer().order(ByteOrder.nativeOrder())); - final Sketch sketch = Sketch.wrap(seg); + final ThetaSketch sketch = ThetaSketch.wrap(seg); assertEquals(sketch.getEstimate(), 1.0); assertTrue(seg.isReadOnly()); } @@ -81,7 +81,7 @@ public void heapifyUpdateSketch() { final MemorySegment seg = MemorySegment.ofBuffer( ByteBuffer.wrap(us1.toByteArray()).asReadOnlyBuffer().order(ByteOrder.nativeOrder())); // downcasting is not recommended, for testing only - final UpdateSketch us2 = (UpdateSketch) Sketch.heapify(seg); + final UpdateSketch us2 = (UpdateSketch) ThetaSketch.heapify(seg); us2.update(2); assertEquals(us2.getEstimate(), 2.0); assertTrue(seg.isReadOnly()); @@ -93,7 +93,7 @@ public void heapifyCompactUnorderedSketch() { updateSketch.update(1); final MemorySegment seg = MemorySegment.ofBuffer( ByteBuffer.wrap(updateSketch.compact(false, null).toByteArray()).asReadOnlyBuffer().order(ByteOrder.nativeOrder())); - final Sketch sketch = Sketch.heapify(seg); + final ThetaSketch sketch = ThetaSketch.heapify(seg); assertEquals(sketch.getEstimate(), 1.0); assertTrue(seg.isReadOnly()); } @@ -104,7 +104,7 @@ public void heapifyCompactOrderedSketch() { updateSketch.update(1); final MemorySegment seg = MemorySegment.ofBuffer( ByteBuffer.wrap(updateSketch.compact().toByteArray()).asReadOnlyBuffer().order(ByteOrder.nativeOrder())); - final Sketch sketch = Sketch.heapify(seg); + final ThetaSketch sketch = ThetaSketch.heapify(seg); assertEquals(sketch.getEstimate(), 1.0); assertTrue(seg.isReadOnly()); } diff --git a/src/test/java/org/apache/datasketches/theta/SetOperationTest.java b/src/test/java/org/apache/datasketches/theta/SetOperationTest.java index 8d4660d91..e19b405c6 100644 --- a/src/test/java/org/apache/datasketches/theta/SetOperationTest.java +++ b/src/test/java/org/apache/datasketches/theta/SetOperationTest.java @@ -20,7 +20,7 @@ package org.apache.datasketches.theta; import static org.apache.datasketches.common.ResizeFactor.X4; -import static org.apache.datasketches.theta.Sketch.getMaxUpdateSketchBytes; +import static org.apache.datasketches.theta.ThetaSketch.getMaxUpdateSketchBytes; import static org.apache.datasketches.thetacommon.HashOperations.minLgHashTableSize; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -347,7 +347,7 @@ private static int[] getHeapLayout(final int sketchNomEntries, final int unionNo final int[] heapLayout = new int[6]; final int unionBytes = SetOperation.getMaxUnionBytes(unionNomEntries); final int sketchBytes = getMaxUpdateSketchBytes(sketchNomEntries); - final int resultBytes = Sketch.getMaxCompactSketchBytes(unionNomEntries); + final int resultBytes = ThetaSketch.getMaxCompactSketchBytes(unionNomEntries); heapLayout[0] = 0; //offset for Union heapLayout[1] = unionBytes; //offset for sketch1 heapLayout[2] = unionBytes + sketchBytes; //offset for sketch2 @@ -395,9 +395,9 @@ private static double directUnionTrial1( //Let's recover the union and the 3rd sketch union = Union.wrap(unionSeg); - union.union(Sketch.wrap(sketch3seg)); + union.union(ThetaSketch.wrap(sketch3seg)); - final Sketch resSk = union.getResult(true, resultSeg); + final ThetaSketch resSk = union.getResult(true, resultSeg); final double est = resSk.getEstimate(); return est; @@ -413,9 +413,9 @@ private static double directUnionTrial2( final MemorySegment resultSeg = heapSeg.asSlice(heapLayout[4], heapLayout[5]-heapLayout[4]); //Recover the 3 sketches - final UpdateSketch sk1 = (UpdateSketch) Sketch.wrap(sketch1seg); - final UpdateSketch sk2 = (UpdateSketch) Sketch.wrap(sketch2seg); - final UpdateSketch sk3 = (UpdateSketch) Sketch.wrap(sketch3seg); + final UpdateSketch sk1 = (UpdateSketch) ThetaSketch.wrap(sketch1seg); + final UpdateSketch sk2 = (UpdateSketch) ThetaSketch.wrap(sketch2seg); + final UpdateSketch sk3 = (UpdateSketch) ThetaSketch.wrap(sketch3seg); //confirm that each of these 3 sketches is exact. assertEquals(sk1.getEstimate(), sketchNomEntries, 0.0); @@ -429,7 +429,7 @@ private static double directUnionTrial2( union.union(sk2); union.union(sk3); - final Sketch resSk = union.getResult(true, resultSeg); + final ThetaSketch resSk = union.getResult(true, resultSeg); final double est = resSk.getEstimate(); return est; diff --git a/src/test/java/org/apache/datasketches/theta/SetOpsCornerCasesTest.java b/src/test/java/org/apache/datasketches/theta/SetOpsCornerCasesTest.java index 4f5380658..80a876991 100644 --- a/src/test/java/org/apache/datasketches/theta/SetOpsCornerCasesTest.java +++ b/src/test/java/org/apache/datasketches/theta/SetOpsCornerCasesTest.java @@ -34,7 +34,7 @@ import org.apache.datasketches.theta.CompactSketch; import org.apache.datasketches.theta.Intersection; import org.apache.datasketches.theta.SetOperation; -import org.apache.datasketches.theta.Sketch; +import org.apache.datasketches.theta.ThetaSketch; import org.apache.datasketches.theta.Union; import org.apache.datasketches.theta.UpdateSketch; import org.testng.Assert; @@ -169,36 +169,36 @@ private static void cornerCaseChecks(final State stateA, final State stateB, fin checkCornerCase(rcskStdStatefulAnotB, rcskStdAnotB); } - private static CompactSketch doStdUnion(final Sketch tskA, final Sketch tskB, final int k, final MemorySegment wseg) { + private static CompactSketch doStdUnion(final ThetaSketch tskA, final ThetaSketch tskB, final int k, final MemorySegment wseg) { final Union union = SetOperation.builder().setNominalEntries(k).buildUnion(); union.union(tskA); union.union(tskB); return union.getResult(true, wseg); } - private static CompactSketch doStdPairUnion(final Sketch tskA, final Sketch tskB, final int k, final MemorySegment wseg) { + private static CompactSketch doStdPairUnion(final ThetaSketch tskA, final ThetaSketch tskB, final int k, final MemorySegment wseg) { final Union union = SetOperation.builder().setNominalEntries(k).buildUnion(); return union.union(tskA, tskB, true, wseg); } - private static CompactSketch doStdIntersection(final Sketch tskA, final Sketch tskB, final MemorySegment wseg) { + private static CompactSketch doStdIntersection(final ThetaSketch tskA, final ThetaSketch tskB, final MemorySegment wseg) { final Intersection inter = SetOperation.builder().buildIntersection(); inter.intersect(tskA); inter.intersect(tskB); return inter.getResult(true, wseg); } - private static CompactSketch doStdPairIntersection(final Sketch tskA, final Sketch tskB, final MemorySegment wseg) { + private static CompactSketch doStdPairIntersection(final ThetaSketch tskA, final ThetaSketch tskB, final MemorySegment wseg) { final Intersection inter = SetOperation.builder().buildIntersection(); return inter.intersect(tskA, tskB, true, wseg); } - private static CompactSketch doStdAnotB(final Sketch tskA, final Sketch tskB, final MemorySegment wseg) { + private static CompactSketch doStdAnotB(final ThetaSketch tskA, final ThetaSketch tskB, final MemorySegment wseg) { final AnotB anotb = SetOperation.builder().buildANotB(); return anotb.aNotB(tskA, tskB, true, wseg); } - private static CompactSketch doStdStatefulAnotB(final Sketch tskA, final Sketch tskB, final MemorySegment wseg) { + private static CompactSketch doStdStatefulAnotB(final ThetaSketch tskA, final ThetaSketch tskB, final MemorySegment wseg) { final AnotB anotb = SetOperation.builder().buildANotB(); anotb.setA(tskA); anotb.notB(tskB); @@ -206,7 +206,7 @@ private static CompactSketch doStdStatefulAnotB(final Sketch tskA, final Sketch return anotb.getResult(true, wseg, true); } - private static CompactSketch doPwUnion(final Sketch tskA, final Sketch tskB, final int k) { + private static CompactSketch doPwUnion(final ThetaSketch tskA, final ThetaSketch tskB, final int k) { CompactSketch tcskA, tcskB; if (tskA == null) { tcskA = null; } else { tcskA = (tskA instanceof CompactSketch) ? (CompactSketch) tskA : tskA.compact(); } @@ -216,18 +216,18 @@ private static CompactSketch doPwUnion(final Sketch tskA, final Sketch tskB, fin return union.union(tcskA, tcskB); } - private static CompactSketch doPwIntersection(final Sketch tskA, final Sketch tskB) { + private static CompactSketch doPwIntersection(final ThetaSketch tskA, final ThetaSketch tskB) { final Intersection inter = SetOperation.builder().buildIntersection(); return inter.intersect(tskA, tskB); } - private static CompactSketch doPwAnotB(final Sketch tskA, final Sketch tskB) { + private static CompactSketch doPwAnotB(final ThetaSketch tskA, final ThetaSketch tskB) { final AnotB aNotB = SetOperation.builder().buildANotB(); return aNotB.aNotB(tskA, tskB); } - private static void checkCornerCase(final Sketch rskA, final Sketch rskB) { + private static void checkCornerCase(final ThetaSketch rskA, final ThetaSketch rskB) { final double estA = rskA.getEstimate(); final double estB = rskB.getEstimate(); final boolean emptyA = rskA.isEmpty(); @@ -494,7 +494,7 @@ private static CompactSketch generate(final State state, final int k) { for (int i = 0; i < (4 * k); i++) { sk.update(i); } - final int bytes = Sketch.getMaxCompactSketchBytes(sk.getRetainedEntries(true)); + final int bytes = ThetaSketch.getMaxCompactSketchBytes(sk.getRetainedEntries(true)); final byte[] byteArr = new byte[bytes]; final MemorySegment wseg = MemorySegment.ofArray(byteArr); csk = sk.compact(false, wseg); diff --git a/src/test/java/org/apache/datasketches/theta/SingleItemSketchTest.java b/src/test/java/org/apache/datasketches/theta/SingleItemSketchTest.java index b073ca255..a0c3cd346 100644 --- a/src/test/java/org/apache/datasketches/theta/SingleItemSketchTest.java +++ b/src/test/java/org/apache/datasketches/theta/SingleItemSketchTest.java @@ -175,7 +175,7 @@ public void checkRestricted() { @Test public void unionWrapped() { - final Sketch sketch = SingleItemSketch.create(1); + final ThetaSketch sketch = SingleItemSketch.create(1); final Union union = SetOperation.builder().buildUnion(); final MemorySegment seg = MemorySegment.ofArray(sketch.toByteArray()); union.union(seg ); @@ -196,7 +196,7 @@ public void buildAndCompact() { assertTrue(csk instanceof SingleItemSketch); //Off-heap - bytes = Sketch.getMaxUpdateSketchBytes(32); + bytes = ThetaSketch.getMaxUpdateSketchBytes(32); MemorySegment wseg = MemorySegment.ofArray(new byte[bytes]); sk1= UpdateSketch.builder().setNominalEntries(32).build(wseg ); sk1.update(1); @@ -205,7 +205,7 @@ public void buildAndCompact() { csk = sk1.compact(false, null); assertTrue(csk instanceof SingleItemSketch); - bytes = Sketch.getMaxCompactSketchBytes(1); + bytes = ThetaSketch.getMaxCompactSketchBytes(1); wseg = MemorySegment.ofArray(new byte[bytes]); csk = sk1.compact(true, wseg ); assertTrue(csk.isOrdered()); @@ -299,7 +299,7 @@ public void checkHeapifyInstance() { final MemorySegment wseg = MemorySegment.ofArray(new byte[16]); final CompactSketch csk = inter.getResult(false, wseg ); assertTrue(csk.isOrdered()); - final Sketch csk2 = Sketch.heapify(wseg ); + final ThetaSketch csk2 = ThetaSketch.heapify(wseg ); assertTrue(csk2 instanceof SingleItemSketch); println(csk2.toString(true, true, 1, true)); } @@ -320,10 +320,10 @@ public void checkSingleItemBadFlags() { @Test public void checkDirectUnionSingleItem2() { - Sketch sk = Sketch.wrap(siSkWoutSiFlag24Bytes()); + ThetaSketch sk = ThetaSketch.wrap(siSkWoutSiFlag24Bytes()); assertEquals(sk.getEstimate(), 1.0, 0.0); //println(sk.toString()); - sk = Sketch.wrap(siSkWithSiFlag24Bytes()); + sk = ThetaSketch.wrap(siSkWithSiFlag24Bytes()); assertEquals(sk.getEstimate(), 1.0, 0.0); //println(sk.toString()); } diff --git a/src/test/java/org/apache/datasketches/theta/SketchMiscTest.java b/src/test/java/org/apache/datasketches/theta/SketchMiscTest.java index e46fd20e6..a920b8426 100644 --- a/src/test/java/org/apache/datasketches/theta/SketchMiscTest.java +++ b/src/test/java/org/apache/datasketches/theta/SketchMiscTest.java @@ -64,16 +64,16 @@ public void checkSketchMethods() { final int k = 1024; final MemorySegment seg = getCompactSketchMemorySegment(k, 0, k); - CompactSketch csk2 = (CompactSketch) Sketch.heapify(seg); + CompactSketch csk2 = (CompactSketch) ThetaSketch.heapify(seg); assertEquals((int)csk2.getEstimate(), k); - csk2 = (CompactSketch) Sketch.heapify(seg, Util.DEFAULT_UPDATE_SEED); + csk2 = (CompactSketch) ThetaSketch.heapify(seg, Util.DEFAULT_UPDATE_SEED); assertEquals((int)csk2.getEstimate(), k); - csk2 = (CompactSketch) Sketch.wrap(seg); + csk2 = (CompactSketch) ThetaSketch.wrap(seg); assertEquals((int)csk2.getEstimate(), k); - csk2 = (CompactSketch) Sketch.wrap(seg, Util.DEFAULT_UPDATE_SEED); + csk2 = (CompactSketch) ThetaSketch.wrap(seg, Util.DEFAULT_UPDATE_SEED); assertEquals((int)csk2.getEstimate(), k); } @@ -112,7 +112,7 @@ public void checkSetOpMethods() { cSk = union2.getResult(true, null); assertEquals((int)cSk.getEstimate(), 3*k/2); - final int serVer = Sketch.getSerializationVersion(uSeg); + final int serVer = ThetaSketch.getSerializationVersion(uSeg); assertEquals(serVer, 3); } @@ -127,15 +127,15 @@ public void checkUtilMethods() { final int maxInterBytes = SetOperation.getMaxIntersectionBytes(k); assertEquals(2*k*8+24, maxInterBytes); - final int maxCompSkBytes = Sketch.getMaxCompactSketchBytes(k+1); + final int maxCompSkBytes = ThetaSketch.getMaxCompactSketchBytes(k+1); assertEquals(24+(k+1)*8, maxCompSkBytes); - final int compSkMaxBytes = Sketch.getCompactSketchMaxBytes(lgK); { + final int compSkMaxBytes = ThetaSketch.getCompactSketchMaxBytes(lgK); { int bytes = (int)((2 << lgK) * ThetaUtil.REBUILD_THRESHOLD + Family.QUICKSELECT.getMaxPreLongs()) * Long.BYTES; assertEquals(compSkMaxBytes, bytes); } - final int maxSkBytes = Sketch.getMaxUpdateSketchBytes(k); + final int maxSkBytes = ThetaSketch.getMaxUpdateSketchBytes(k); assertEquals(24+2*k*8, maxSkBytes); } @@ -144,7 +144,7 @@ public void checkBadSketchFamily() { final Union union = SetOperation.builder().buildUnion(); final byte[] byteArr = union.toByteArray(); final MemorySegment srcSeg = MemorySegment.ofArray(byteArr); - Sketch.getEstimate(srcSeg); //Union is not a Theta Sketch, it is an operation + ThetaSketch.getEstimate(srcSeg); //Union is not a Theta Sketch, it is an operation } @Test diff --git a/src/test/java/org/apache/datasketches/theta/SketchTest.java b/src/test/java/org/apache/datasketches/theta/SketchTest.java index cffee0b08..0891aea80 100644 --- a/src/test/java/org/apache/datasketches/theta/SketchTest.java +++ b/src/test/java/org/apache/datasketches/theta/SketchTest.java @@ -31,7 +31,7 @@ import static org.apache.datasketches.theta.PreambleUtil.COMPACT_FLAG_MASK; import static org.apache.datasketches.theta.PreambleUtil.FLAGS_BYTE; import static org.apache.datasketches.theta.PreambleUtil.READ_ONLY_FLAG_MASK; -import static org.apache.datasketches.theta.Sketch.getMaxCompactSketchBytes; +import static org.apache.datasketches.theta.ThetaSketch.getMaxCompactSketchBytes; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -108,7 +108,7 @@ public void checkGetCurrentBytes() { assertEquals(compPreLongs, 3); for (int i=0; i<3; i++) { - final int maxCompBytes = Sketch.getMaxCompactSketchBytes(i); + final int maxCompBytes = ThetaSketch.getMaxCompactSketchBytes(i); if (i == 0) { assertEquals(maxCompBytes, 8); } if (i == 1) { assertEquals(maxCompBytes, 16); } if (i > 1) { assertEquals(maxCompBytes, 24 + (i * 8)); } //assumes maybe estimation mode @@ -182,7 +182,7 @@ public void checkWrapBadFamily() { final UpdateSketch sketch = UpdateSketch.builder().setFamily(Family.ALPHA).setNominalEntries(1024).build(); final byte[] byteArr = sketch.toByteArray(); final MemorySegment srcSeg = MemorySegment.ofArray(byteArr); - Sketch.wrap(srcSeg); + ThetaSketch.wrap(srcSeg); } @Test(expectedExceptions = SketchesArgumentException.class) @@ -196,7 +196,7 @@ public void checkSerVer() { final UpdateSketch sketch = UpdateSketch.builder().setNominalEntries(1024).build(); final byte[] sketchArray = sketch.toByteArray(); final MemorySegment seg = MemorySegment.ofArray(sketchArray); - int serVer = Sketch.getSerializationVersion(seg); + int serVer = ThetaSketch.getSerializationVersion(seg); assertEquals(serVer, 3); final MemorySegment wseg = MemorySegment.ofArray(sketchArray); final UpdateSketch sk2 = UpdateSketch.wrap(wseg); @@ -207,36 +207,36 @@ public void checkSerVer() { @Test(expectedExceptions = SketchesArgumentException.class) public void checkHeapifyAlphaCompactExcep() { final int k = 512; - final Sketch sketch1 = UpdateSketch.builder().setFamily(ALPHA).setNominalEntries(k).build(); + final ThetaSketch sketch1 = UpdateSketch.builder().setFamily(ALPHA).setNominalEntries(k).build(); final byte[] byteArray = sketch1.toByteArray(); final MemorySegment seg = MemorySegment.ofArray(byteArray); //corrupt: Util.setBits(seg, FLAGS_BYTE, (byte) COMPACT_FLAG_MASK); - Sketch.heapify(seg); + ThetaSketch.heapify(seg); } @Test(expectedExceptions = SketchesArgumentException.class) public void checkHeapifyQSCompactExcep() { final int k = 512; - final Sketch sketch1 = UpdateSketch.builder().setFamily(QUICKSELECT).setNominalEntries(k).build(); + final ThetaSketch sketch1 = UpdateSketch.builder().setFamily(QUICKSELECT).setNominalEntries(k).build(); final byte[] byteArray = sketch1.toByteArray(); final MemorySegment seg = MemorySegment.ofArray(byteArray); //corrupt: Util.setBits(seg, FLAGS_BYTE, (byte) COMPACT_FLAG_MASK); - Sketch.heapify(seg); + ThetaSketch.heapify(seg); } @Test(expectedExceptions = SketchesArgumentException.class) public void checkHeapifyNotCompactExcep() { final int k = 512; final UpdateSketch sketch1 = UpdateSketch.builder().setFamily(QUICKSELECT).setNominalEntries(k).build(); - final int bytes = Sketch.getMaxCompactSketchBytes(0); + final int bytes = ThetaSketch.getMaxCompactSketchBytes(0); final byte[] byteArray = new byte[bytes]; final MemorySegment seg = MemorySegment.ofArray(byteArray); sketch1.compact(false, seg); //corrupt: Util.clearBits(seg, FLAGS_BYTE, (byte) COMPACT_FLAG_MASK); - Sketch.heapify(seg); + ThetaSketch.heapify(seg); } @Test(expectedExceptions = SketchesArgumentException.class) @@ -246,50 +246,50 @@ public void checkHeapifyFamilyExcep() { final byte[] byteArray = union.toByteArray(); final MemorySegment seg = MemorySegment.ofArray(byteArray); //Improper use - Sketch.heapify(seg); + ThetaSketch.heapify(seg); } @Test(expectedExceptions = SketchesArgumentException.class) public void checkWrapAlphaCompactExcep() { final int k = 512; - final Sketch sketch1 = UpdateSketch.builder().setFamily(ALPHA).setNominalEntries(k).build(); + final ThetaSketch sketch1 = UpdateSketch.builder().setFamily(ALPHA).setNominalEntries(k).build(); final byte[] byteArray = sketch1.toByteArray(); final MemorySegment seg = MemorySegment.ofArray(byteArray); //corrupt: Util.setBits(seg, FLAGS_BYTE, (byte) COMPACT_FLAG_MASK); - Sketch.wrap(seg); + ThetaSketch.wrap(seg); } @Test(expectedExceptions = SketchesArgumentException.class) public void checkWrapQSCompactExcep() { final int k = 512; - final Sketch sketch1 = UpdateSketch.builder().setFamily(QUICKSELECT).setNominalEntries(k).build(); + final ThetaSketch sketch1 = UpdateSketch.builder().setFamily(QUICKSELECT).setNominalEntries(k).build(); final byte[] byteArray = sketch1.toByteArray(); final MemorySegment seg = MemorySegment.ofArray(byteArray); //corrupt: Util.setBits(seg, FLAGS_BYTE, (byte) COMPACT_FLAG_MASK); - Sketch.wrap(seg); + ThetaSketch.wrap(seg); } @Test(expectedExceptions = SketchesArgumentException.class) public void checkWrapNotCompactExcep() { final int k = 512; final UpdateSketch sketch1 = UpdateSketch.builder().setFamily(QUICKSELECT).setNominalEntries(k).build(); - final int bytes = Sketch.getMaxCompactSketchBytes(0); + final int bytes = ThetaSketch.getMaxCompactSketchBytes(0); final byte[] byteArray = new byte[bytes]; final MemorySegment seg = MemorySegment.ofArray(byteArray); sketch1.compact(false, seg); //corrupt: Util.clearBits(seg, FLAGS_BYTE, (byte) COMPACT_FLAG_MASK); - Sketch.wrap(seg); + ThetaSketch.wrap(seg); } @Test public void checkValidSketchID() { - assertFalse(Sketch.isValidSketchID(0)); - assertTrue(Sketch.isValidSketchID(ALPHA.getID())); - assertTrue(Sketch.isValidSketchID(QUICKSELECT.getID())); - assertTrue(Sketch.isValidSketchID(COMPACT.getID())); + assertFalse(ThetaSketch.isValidSketchID(0)); + assertTrue(ThetaSketch.isValidSketchID(ALPHA.getID())); + assertTrue(ThetaSketch.isValidSketchID(QUICKSELECT.getID())); + assertTrue(ThetaSketch.isValidSketchID(COMPACT.getID())); } @Test @@ -325,7 +325,7 @@ public void checkCountLessThanTheta() { private static MemorySegment createCompactSketchMemorySegment(final int k, final int u) { final UpdateSketch usk = UpdateSketch.builder().setNominalEntries(k).build(); for (int i = 0; i < u; i++) { usk.update(i); } - final int bytes = Sketch.getMaxCompactSketchBytes(usk.getRetainedEntries(true)); + final int bytes = ThetaSketch.getMaxCompactSketchBytes(usk.getRetainedEntries(true)); final MemorySegment wseg = MemorySegment.ofArray(new byte[bytes]); usk.compact(true, wseg); return wseg; @@ -334,27 +334,27 @@ private static MemorySegment createCompactSketchMemorySegment(final int k, final @Test public void checkCompactFlagsOnWrap() { final MemorySegment wseg = createCompactSketchMemorySegment(16, 32); - Sketch sk = Sketch.wrap(wseg); + ThetaSketch sk = ThetaSketch.wrap(wseg); assertTrue(sk instanceof CompactSketch); final int flags = PreambleUtil.extractFlags(wseg); final int flagsNoCompact = flags & ~COMPACT_FLAG_MASK; PreambleUtil.insertFlags(wseg, flagsNoCompact); try { - sk = Sketch.wrap(wseg); + sk = ThetaSketch.wrap(wseg); fail(); } catch (final SketchesArgumentException e) { } final int flagsNoReadOnly = flags & ~READ_ONLY_FLAG_MASK; PreambleUtil.insertFlags(wseg, flagsNoReadOnly); try { - sk = Sketch.wrap(wseg); + sk = ThetaSketch.wrap(wseg); fail(); } catch (final SketchesArgumentException e) { } PreambleUtil.insertFlags(wseg, flags); //repair to original PreambleUtil.insertSerVer(wseg, 5); try { - sk = Sketch.wrap(wseg); + sk = ThetaSketch.wrap(wseg); fail(); } catch (final SketchesArgumentException e) { } } @@ -362,14 +362,14 @@ public void checkCompactFlagsOnWrap() { @Test public void checkCompactSizeAndFlagsOnHeapify() { MemorySegment wseg = createCompactSketchMemorySegment(16, 32); - Sketch sk = Sketch.heapify(wseg); + ThetaSketch sk = ThetaSketch.heapify(wseg); assertTrue(sk instanceof CompactSketch); final int flags = PreambleUtil.extractFlags(wseg); final int flagsNoCompact = flags & ~READ_ONLY_FLAG_MASK; PreambleUtil.insertFlags(wseg, flagsNoCompact); try { - sk = Sketch.heapify(wseg); + sk = ThetaSketch.heapify(wseg); fail(); } catch (final SketchesArgumentException e) { } @@ -377,7 +377,7 @@ public void checkCompactSizeAndFlagsOnHeapify() { PreambleUtil.insertSerVer(wseg, 3); //PreambleUtil.insertFamilyID(wseg, 3); try { - sk = Sketch.heapify(wseg); + sk = ThetaSketch.heapify(wseg); fail(); } catch (final SketchesArgumentException e) { } } @@ -385,7 +385,7 @@ public void checkCompactSizeAndFlagsOnHeapify() { @Test public void check2Methods() { final int k = 16; - final Sketch sk = UpdateSketch.builder().setNominalEntries(k).build(); + final ThetaSketch sk = UpdateSketch.builder().setNominalEntries(k).build(); final int bytes1 = sk.getCompactBytes(); final int bytes2 = sk.getCurrentBytes(); assertEquals(bytes1, 8); diff --git a/src/test/java/org/apache/datasketches/theta/UnionImplTest.java b/src/test/java/org/apache/datasketches/theta/UnionImplTest.java index 1cc7c76e7..98fdfb582 100644 --- a/src/test/java/org/apache/datasketches/theta/UnionImplTest.java +++ b/src/test/java/org/apache/datasketches/theta/UnionImplTest.java @@ -150,7 +150,7 @@ public void checkCorruptFamilyException() { public void checkMoveAndResizeOffHeap() { final int k = 1 << 12; final int u = 2 * k; - final int bytes = Sketch.getMaxUpdateSketchBytes(k); + final int bytes = ThetaSketch.getMaxUpdateSketchBytes(k); MemorySegment skWseg, uWseg; try (Arena arena = Arena.ofConfined()) { skWseg = arena.allocate(bytes / 2); //we never populate the sketch so this size is not relevant @@ -203,7 +203,7 @@ public void checkUnionCompactOrderedSource() { for (int i = 0; i < k; i++) { sk.update(i); } final double est1 = sk.getEstimate(); - final int bytes = Sketch.getCompactSketchMaxBytes(lgK); + final int bytes = ThetaSketch.getCompactSketchMaxBytes(lgK); try (Arena arena = Arena.ofConfined()) { final MemorySegment wseg = arena.allocate(bytes); @@ -220,7 +220,7 @@ public void checkUnionCompactOrderedSource() { @Test(expectedExceptions = SketchesArgumentException.class) public void checkCompactFlagCorruption() { final int k = 1 << 12; - final int bytes = Sketch.getMaxUpdateSketchBytes(k); + final int bytes = ThetaSketch.getMaxUpdateSketchBytes(k); final MemorySegment wseg1 = MemorySegment.ofArray(new byte[bytes]); final UpdateSketch sk = UpdateSketch.builder().setNominalEntries(k).build(wseg1); for (int i = 0; i < k; i++) { sk.update(i); } diff --git a/src/test/java/org/apache/datasketches/theta/UpdateSketchTest.java b/src/test/java/org/apache/datasketches/theta/UpdateSketchTest.java index a3bdaa221..00dbb6c70 100644 --- a/src/test/java/org/apache/datasketches/theta/UpdateSketchTest.java +++ b/src/test/java/org/apache/datasketches/theta/UpdateSketchTest.java @@ -173,13 +173,13 @@ public void checkCorruption() { final MemorySegment wseg = MemorySegment.ofArray(sk.toByteArray()); try { wseg.set(JAVA_BYTE, SER_VER_BYTE, (byte) 2); - Sketch.wrap(wseg, Util.DEFAULT_UPDATE_SEED); + ThetaSketch.wrap(wseg, Util.DEFAULT_UPDATE_SEED); fail(); } catch (final SketchesArgumentException e) { } try { wseg.set(JAVA_BYTE, SER_VER_BYTE, (byte) 3); wseg.set(JAVA_BYTE, PREAMBLE_LONGS_BYTE, (byte) 2); - Sketch.wrap(wseg, Util.DEFAULT_UPDATE_SEED); + ThetaSketch.wrap(wseg, Util.DEFAULT_UPDATE_SEED); fail(); } catch (final SketchesArgumentException e) { } } diff --git a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleAnotBTest.java b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleAnotBTest.java index a878e50dc..c8b4a8135 100644 --- a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleAnotBTest.java +++ b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleAnotBTest.java @@ -49,7 +49,7 @@ private static void threeMethodsWithTheta( final AnotB aNotB, final Sketch skA, final Sketch skB, - final org.apache.datasketches.theta.Sketch skThetaB, + final org.apache.datasketches.theta.ThetaSketch skThetaB, final Results results) { CompactSketch result; From b8b988de34fb353b9487ad0c49003e035620e988 Mon Sep 17 00:00:00 2001 From: Lee Rhodes Date: Thu, 9 Oct 2025 17:31:15 -0700 Subject: [PATCH 2/7] Completed Theta Sketch name changes. This only involved mostly public classes. --- .../theta/{CompactSketch.java => CompactThetaSketch.java} | 0 .../org/apache/datasketches/theta/{AnotB.java => ThetaAnotB.java} | 0 .../datasketches/theta/{AnotBimpl.java => ThetaAnotBimpl.java} | 0 .../theta/{Intersection.java => ThetaIntersection.java} | 0 .../theta/{IntersectionImpl.java => ThetaIntersectionImpl.java} | 0 .../theta/{SetOperation.java => ThetaSetOperation.java} | 0 .../{SetOperationBuilder.java => ThetaSetOperationBuilder.java} | 0 .../org/apache/datasketches/theta/{Union.java => ThetaUnion.java} | 0 .../datasketches/theta/{UnionImpl.java => ThetaUnionImpl.java} | 0 .../theta/{UpdateSketch.java => UpdatableThetaSketch.java} | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename src/main/java/org/apache/datasketches/theta/{CompactSketch.java => CompactThetaSketch.java} (100%) rename src/main/java/org/apache/datasketches/theta/{AnotB.java => ThetaAnotB.java} (100%) rename src/main/java/org/apache/datasketches/theta/{AnotBimpl.java => ThetaAnotBimpl.java} (100%) rename src/main/java/org/apache/datasketches/theta/{Intersection.java => ThetaIntersection.java} (100%) rename src/main/java/org/apache/datasketches/theta/{IntersectionImpl.java => ThetaIntersectionImpl.java} (100%) rename src/main/java/org/apache/datasketches/theta/{SetOperation.java => ThetaSetOperation.java} (100%) rename src/main/java/org/apache/datasketches/theta/{SetOperationBuilder.java => ThetaSetOperationBuilder.java} (100%) rename src/main/java/org/apache/datasketches/theta/{Union.java => ThetaUnion.java} (100%) rename src/main/java/org/apache/datasketches/theta/{UnionImpl.java => ThetaUnionImpl.java} (100%) rename src/main/java/org/apache/datasketches/theta/{UpdateSketch.java => UpdatableThetaSketch.java} (100%) diff --git a/src/main/java/org/apache/datasketches/theta/CompactSketch.java b/src/main/java/org/apache/datasketches/theta/CompactThetaSketch.java similarity index 100% rename from src/main/java/org/apache/datasketches/theta/CompactSketch.java rename to src/main/java/org/apache/datasketches/theta/CompactThetaSketch.java diff --git a/src/main/java/org/apache/datasketches/theta/AnotB.java b/src/main/java/org/apache/datasketches/theta/ThetaAnotB.java similarity index 100% rename from src/main/java/org/apache/datasketches/theta/AnotB.java rename to src/main/java/org/apache/datasketches/theta/ThetaAnotB.java diff --git a/src/main/java/org/apache/datasketches/theta/AnotBimpl.java b/src/main/java/org/apache/datasketches/theta/ThetaAnotBimpl.java similarity index 100% rename from src/main/java/org/apache/datasketches/theta/AnotBimpl.java rename to src/main/java/org/apache/datasketches/theta/ThetaAnotBimpl.java diff --git a/src/main/java/org/apache/datasketches/theta/Intersection.java b/src/main/java/org/apache/datasketches/theta/ThetaIntersection.java similarity index 100% rename from src/main/java/org/apache/datasketches/theta/Intersection.java rename to src/main/java/org/apache/datasketches/theta/ThetaIntersection.java diff --git a/src/main/java/org/apache/datasketches/theta/IntersectionImpl.java b/src/main/java/org/apache/datasketches/theta/ThetaIntersectionImpl.java similarity index 100% rename from src/main/java/org/apache/datasketches/theta/IntersectionImpl.java rename to src/main/java/org/apache/datasketches/theta/ThetaIntersectionImpl.java diff --git a/src/main/java/org/apache/datasketches/theta/SetOperation.java b/src/main/java/org/apache/datasketches/theta/ThetaSetOperation.java similarity index 100% rename from src/main/java/org/apache/datasketches/theta/SetOperation.java rename to src/main/java/org/apache/datasketches/theta/ThetaSetOperation.java diff --git a/src/main/java/org/apache/datasketches/theta/SetOperationBuilder.java b/src/main/java/org/apache/datasketches/theta/ThetaSetOperationBuilder.java similarity index 100% rename from src/main/java/org/apache/datasketches/theta/SetOperationBuilder.java rename to src/main/java/org/apache/datasketches/theta/ThetaSetOperationBuilder.java diff --git a/src/main/java/org/apache/datasketches/theta/Union.java b/src/main/java/org/apache/datasketches/theta/ThetaUnion.java similarity index 100% rename from src/main/java/org/apache/datasketches/theta/Union.java rename to src/main/java/org/apache/datasketches/theta/ThetaUnion.java diff --git a/src/main/java/org/apache/datasketches/theta/UnionImpl.java b/src/main/java/org/apache/datasketches/theta/ThetaUnionImpl.java similarity index 100% rename from src/main/java/org/apache/datasketches/theta/UnionImpl.java rename to src/main/java/org/apache/datasketches/theta/ThetaUnionImpl.java diff --git a/src/main/java/org/apache/datasketches/theta/UpdateSketch.java b/src/main/java/org/apache/datasketches/theta/UpdatableThetaSketch.java similarity index 100% rename from src/main/java/org/apache/datasketches/theta/UpdateSketch.java rename to src/main/java/org/apache/datasketches/theta/UpdatableThetaSketch.java From 36e2e0865a1cc437af275fe4240d51d80822ed0f Mon Sep 17 00:00:00 2001 From: Lee Rhodes Date: Thu, 9 Oct 2025 17:32:49 -0700 Subject: [PATCH 3/7] Forgot to stage the previous commit. All the classes affected by the name changes for Theta. --- .../datasketches/theta/CompactOperations.java | 32 +-- .../theta/CompactThetaSketch.java | 66 ++--- .../ConcurrentBackgroundThetaPropagation.java | 2 +- .../ConcurrentDirectQuickSelectSketch.java | 8 +- .../ConcurrentHeapQuickSelectSketch.java | 10 +- .../theta/ConcurrentHeapThetaBuffer.java | 12 +- .../theta/ConcurrentSharedThetaSketch.java | 10 +- .../theta/DirectCompactCompressedSketch.java | 10 +- .../theta/DirectCompactSketch.java | 10 +- .../theta/DirectQuickSelectSketch.java | 18 +- .../theta/DirectQuickSelectSketchR.java | 30 +-- .../theta/EmptyCompactSketch.java | 10 +- .../datasketches/theta/HeapAlphaSketch.java | 26 +- .../datasketches/theta/HeapCompactSketch.java | 10 +- .../theta/HeapQuickSelectSketch.java | 14 +- .../datasketches/theta/HeapUpdateSketch.java | 10 +- .../datasketches/theta/JaccardSimilarity.java | 22 +- .../datasketches/theta/PreambleUtil.java | 28 +- .../datasketches/theta/SingleItemSketch.java | 48 ++-- .../apache/datasketches/theta/ThetaAnotB.java | 60 ++--- .../datasketches/theta/ThetaAnotBimpl.java | 22 +- .../datasketches/theta/ThetaIntersection.java | 46 ++-- .../theta/ThetaIntersectionImpl.java | 62 ++--- .../datasketches/theta/ThetaSetOperation.java | 72 ++--- .../theta/ThetaSetOperationBuilder.java | 104 ++++---- .../datasketches/theta/ThetaSketch.java | 112 ++++---- .../apache/datasketches/theta/ThetaUnion.java | 82 +++--- .../datasketches/theta/ThetaUnionImpl.java | 82 +++--- .../theta/UpdatableThetaSketch.java | 40 +-- .../datasketches/theta/UpdateReturnState.java | 8 +- .../theta/UpdateSketchBuilder.java | 76 +++--- .../theta/WrappedCompactCompressedSketch.java | 8 +- .../theta/WrappedCompactSketch.java | 12 +- .../datasketches/theta/package-info.java | 8 +- .../org/apache/datasketches/tuple/AnotB.java | 2 +- .../org/apache/datasketches/tuple/Union.java | 18 +- .../datasketches/theta/AnotBimplTest.java | 74 +++--- .../datasketches/theta/CompactSketchTest.java | 136 +++++----- ...ConcurrentDirectQuickSelectSketchTest.java | 106 ++++---- .../ConcurrentHeapQuickSelectSketchTest.java | 92 +++---- .../CornerCaseThetaSetOperationsTest.java | 124 ++++----- .../theta/DirectIntersectionTest.java | 249 +++++++++--------- .../theta/DirectQuickSelectSketchTest.java | 100 +++---- .../datasketches/theta/DirectUnionTest.java | 220 ++++++++-------- .../apache/datasketches/theta/EmptyTest.java | 46 ++-- .../datasketches/theta/ExamplesTest.java | 41 ++- .../theta/HeapAlphaSketchTest.java | 78 +++--- .../theta/HeapIntersectionTest.java | 180 ++++++------- .../theta/HeapQuickSelectSketchTest.java | 70 ++--- .../datasketches/theta/HeapUnionTest.java | 182 ++++++------- .../theta/HeapifyWrapSerVer3Test.java | 72 ++--- .../datasketches/theta/IteratorTest.java | 14 +- .../theta/JaccardSimilarityTest.java | 26 +- .../theta/PairwiseSetOperationsTest.java | 169 ++++++------ .../datasketches/theta/PreambleUtilTest.java | 12 +- .../theta/ReadOnlyMemorySegmentTest.java | 42 +-- .../datasketches/theta/SetOperationTest.java | 112 ++++---- .../theta/SetOpsCornerCasesTest.java | 187 +++++++------ .../theta/SingleItemSketchTest.java | 86 +++--- .../datasketches/theta/SketchMiscTest.java | 40 +-- .../apache/datasketches/theta/SketchTest.java | 46 ++-- .../theta/ThetaSketchCrossLanguageTest.java | 22 +- .../datasketches/theta/UnionImplTest.java | 78 +++--- .../datasketches/theta/UpdateSketchTest.java | 26 +- ...BoundsOnRatiosInThetaSketchedSetsTest.java | 20 +- ...BoundsOnRatiosInTupleSketchedSetsTest.java | 8 +- .../tuple/JaccardSimilarityTest.java | 16 +- .../tuple/TupleExamples2Test.java | 12 +- .../datasketches/tuple/TupleExamplesTest.java | 8 +- .../tuple/adouble/AdoubleAnotBTest.java | 16 +- .../adouble/AdoubleIntersectionTest.java | 18 +- .../tuple/adouble/AdoubleUnionTest.java | 4 +- .../CornerCaseTupleSetOperationsTest.java | 40 +-- 73 files changed, 1965 insertions(+), 1997 deletions(-) diff --git a/src/main/java/org/apache/datasketches/theta/CompactOperations.java b/src/main/java/org/apache/datasketches/theta/CompactOperations.java index 9fb917b24..fe7b6b60c 100644 --- a/src/main/java/org/apache/datasketches/theta/CompactOperations.java +++ b/src/main/java/org/apache/datasketches/theta/CompactOperations.java @@ -60,7 +60,7 @@ final class CompactOperations { private CompactOperations() {} - static CompactSketch componentsToCompact( //No error checking + static CompactThetaSketch componentsToCompact( //No error checking final long thetaLong, final int curCount, final short seedHash, @@ -108,15 +108,15 @@ static CompactSketch componentsToCompact( //No error checking } /** - * Heapify or convert a source Theta Sketch MemorySegment image into a heap or target MemorySegment CompactSketch. + * Heapify or convert a source ThetaSketch MemorySegment image into a heap or target MemorySegment CompactThetaSketch. * This assumes hashSeed is OK; serVer = 3. * @param srcSeg the given input source MemorySegment image. Can be Read Only. - * @param dstOrdered the desired ordering of the resulting CompactSketch - * @param dstWSeg Used for the target CompactSketch if it is MemorySegment-based. Must be Writable. - * @return a CompactSketch of the correct form. + * @param dstOrdered the desired ordering of the resulting CompactThetaSketch + * @param dstWSeg Used for the target CompactThetaSketch if it is MemorySegment-based. Must be Writable. + * @return a CompactThetaSketch of the correct form. */ @SuppressWarnings("unused") - static CompactSketch segmentToCompact( + static CompactThetaSketch segmentToCompact( final MemorySegment srcSeg, final boolean dstOrdered, final MemorySegment dstWSeg) @@ -233,7 +233,7 @@ static MemorySegment loadCompactMemorySegment( } final byte famID = (byte) Family.COMPACT.getID(); - //It is important to make sure that all byte fields are initialized, even those that are not used by the CompactSketch. + //It is important to make sure that all byte fields are initialized, even those that are not used by the CompactThetaSketch. // Otherwise, uninitialized fields could could cause other problems downstream. // As written below, all fields are initialized. @@ -242,7 +242,7 @@ static MemorySegment loadCompactMemorySegment( insertSerVer(dstWSeg, SER_VER); insertFamilyID(dstWSeg, famID); //The following initializes the lgNomLongs and lgArrLongs to 0. - //They are not used in CompactSketches. + //They are not used in CompactThetaSketches. dstWSeg.set(JAVA_SHORT_UNALIGNED, LG_NOM_LONGS_BYTE, (short)0); insertFlags(dstWSeg, flags); insertSeedHash(dstWSeg, seedHash); @@ -305,15 +305,15 @@ static long[] compactCache(final long[] srcCache, final int curCount, * Num Theta CurCount Empty State Name, Comments * 0 1.0 0 T OK EMPTY: The Normal Empty State * 1 1.0 0 F Internal This can occur internally as the result of an intersection of two exact, - * disjoint sets, or AnotB of two exact, identical sets. There is no probability + * disjoint sets, or ThetaAnotB of two exact, identical sets. There is no probability * distribution, so this is converted internally to EMPTY {1.0, 0, T}. - * This is handled in SetOperation.createCompactSketch(). + * This is handled in ThetaSetOperation.createCompactThetaSketch(). * 2 1.0 !0 T Error Empty=T and curCount !0 should never coexist. * This is checked in all compacting operations. * 3 1.0 !0 F OK EXACT: This corresponds to a sketch in exact mode - * 4 <1.0 0 T Internal This can be an initial UpdateSketch state if p < 1.0, + * 4 <1.0 0 T Internal This can be an initial UpdatableThetaSketch state if p < 1.0, * so change theta to 1.0. Return {Th = 1.0, 0, T}. - * This is handled in UpdateSketch.compact() and toByteArray(). + * This is handled in UpdatableThetaSketch.compact() and toByteArray(). * 5 <1.0 0 F OK This can result from set operations * 6 <1.0 !0 T Error Empty=T and curCount !0 should never coexist. * This is checked in all compacting operations. @@ -324,11 +324,11 @@ static long[] compactCache(final long[] srcCache, final int curCount, */ /** - * This corrects a temporary anomalous condition where compact() or toByteArray() is called on an UpdateSketch + * This corrects a temporary anomalous condition where compact() or toByteArray() is called on an UpdatableThetaSketch * that was initialized with p < 1.0 and update() was never called. In this case Theta < 1.0, * curCount = 0, and empty = true. The correction is to change Theta to 1.0, which makes the * returning sketch empty. This should only be used in the compaction or serialization of an - * UpdateSketch. + * UpdatableThetaSketch. * @param empty the given empty state * @param curCount the given curCount * @param thetaLong the given thetaLong @@ -355,7 +355,7 @@ static void checkIllegalCurCountAndEmpty(final boolean empty, final int curCount /** * This compute number of preamble longs for a compact sketch based on empty, * curCount and thetaLong. - * This also accommodates for EmptyCompactSketch and SingleItemSketch. + * This also accommodates for EmptyCompactThetaSketch and SingleItemThetaSketch. * @param empty The given empty state * @param curCount The given current count (retained entries) * @param thetaLong the current thetaLong @@ -367,7 +367,7 @@ static int computeCompactPreLongs(final boolean empty, final int curCount, } /** - * This checks for the singleItem Compact Sketch. + * This checks for the singleItem CompactThetaSketch. * @param empty the given empty state * @param curCount the given curCount * @param thetaLong the given thetaLong diff --git a/src/main/java/org/apache/datasketches/theta/CompactThetaSketch.java b/src/main/java/org/apache/datasketches/theta/CompactThetaSketch.java index d560a8729..9dedaac46 100644 --- a/src/main/java/org/apache/datasketches/theta/CompactThetaSketch.java +++ b/src/main/java/org/apache/datasketches/theta/CompactThetaSketch.java @@ -46,49 +46,49 @@ import org.apache.datasketches.common.Util; /** - * The parent class of all the CompactSketches. CompactSketches are never created directly. - * They are created as a result of the compact() method of an UpdateSketch, a result of a - * getResult() of a SetOperation, or from a heapify method. + * The parent class of all the CompactThetaSketches. CompactThetaSketches are never created directly. + * They are created as a result of the compact() method of an UpdatableThetaSketch, a result of a + * getResult() of a ThetaSetOperation, or from a heapify method. * - *

A CompactSketch is the simplest form of a Theta Sketch. It consists of a compact list + *

A CompactThetaSketch is the simplest form of a ThetaSketches. It consists of a compact list * (i.e., no intervening spaces) of hash values, which may be ordered or not, a value for theta - * and a seed hash. A CompactSketch is immutable (read-only), + * and a seed hash. A CompactThetaSketch is immutable (read-only), * and the space required when stored is only the space required for the hash values and 8 to 24 - * bytes of preamble. An empty CompactSketch consumes only 8 bytes.

+ * bytes of preamble. An empty CompactThetaSketch consumes only 8 bytes.

* * @author Lee Rhodes */ -public abstract class CompactSketch extends ThetaSketch { +public abstract class CompactThetaSketch extends ThetaSketch { /** - * Heapify takes a CompactSketch image in a MemorySegment and instantiates an on-heap CompactSketch. + * Heapify takes a CompactThetaSketch image in a MemorySegment and instantiates an on-heap CompactThetaSketch. * *

The resulting sketch will not retain any link to the source MemorySegment and all of its data will be - * copied to the heap CompactSketch.

+ * copied to the heap CompactThetaSketch.

* *

The {@link Util#DEFAULT_UPDATE_SEED DEFAULT_UPDATE_SEED} is assumed.

* - * @param srcSeg an image of a CompactSketch. - * @return a CompactSketch on the heap. + * @param srcSeg an image of a CompactThetaSketch. + * @return a CompactThetaSketch on the heap. */ - public static CompactSketch heapify(final MemorySegment srcSeg) { + public static CompactThetaSketch heapify(final MemorySegment srcSeg) { return heapify(srcSeg, Util.DEFAULT_UPDATE_SEED); } /** - * Heapify takes a CompactSketch image in a MemorySegment and instantiates an on-heap CompactSketch. + * Heapify takes a CompactThetaSketch image in a MemorySegment and instantiates an on-heap CompactThetaSketch. * *

The resulting sketch will not retain any link to the source MemorySegment and all of its data will be - * copied to the heap CompactSketch.

+ * copied to the heap CompactThetaSketch.

* *

This method checks if the given expectedSeed was used to create the source MemorySegment image.

* - * @param srcSeg an image of a CompactSketch that was created using the given expectedSeed. + * @param srcSeg an image of a CompactThetaSketch that was created using the given expectedSeed. * @param expectedSeed the seed used to validate the given MemorySegment image. * See Update Hash Seed. - * @return a CompactSketch on the heap. + * @return a CompactThetaSketch on the heap. */ - public static CompactSketch heapify(final MemorySegment srcSeg, final long expectedSeed) { + public static CompactThetaSketch heapify(final MemorySegment srcSeg, final long expectedSeed) { final int serVer = extractSerVer(srcSeg); final int familyID = extractFamilyID(srcSeg); final Family family = idToFamily(familyID); @@ -111,7 +111,7 @@ public static CompactSketch heapify(final MemorySegment srcSeg, final long expec } /** - * Wrap takes the CompactSketch image in given MemorySegment and refers to it directly. + * Wrap takes the CompactThetaSketch image in given MemorySegment and refers to it directly. * There is no data copying onto the java heap. * The wrap operation enables fast read-only merging and access to all the public read-only API. * @@ -121,10 +121,10 @@ public static CompactSketch heapify(final MemorySegment srcSeg, final long expec * *

The {@link Util#DEFAULT_UPDATE_SEED DEFAULT_UPDATE_SEED} is assumed.

* - * @param srcSeg an image of a Sketch. - * @return a CompactSketch backed by the given MemorySegment. + * @param srcSeg an image of a CompactThetaSketch. + * @return a CompactThetaSketch backed by the given MemorySegment. */ - public static CompactSketch wrap(final MemorySegment srcSeg) { + public static CompactThetaSketch wrap(final MemorySegment srcSeg) { return wrap(srcSeg, Util.DEFAULT_UPDATE_SEED); } @@ -139,12 +139,12 @@ public static CompactSketch wrap(final MemorySegment srcSeg) { * *

This method checks if the given expectedSeed was used to create the source MemorySegment image.

* - * @param srcSeg an image of a Sketch that was created using the given expectedSeed. + * @param srcSeg an image of a CompactThetaSketch that was created using the given expectedSeed. * @param expectedSeed the seed used to validate the given MemorySegment image. * See Update Hash Seed. - * @return a CompactSketch backed by the given MemorySegment. + * @return a CompactThetaketch backed by the given MemorySegment. */ - public static CompactSketch wrap(final MemorySegment srcSeg, final long expectedSeed) { + public static CompactThetaSketch wrap(final MemorySegment srcSeg, final long expectedSeed) { final int serVer = extractSerVer(srcSeg); final int familyID = extractFamilyID(srcSeg); final Family family = Family.idToFamily(familyID); @@ -196,11 +196,11 @@ public static CompactSketch wrap(final MemorySegment srcSeg, final long expected * *

This method checks if the DEFAULT_UPDATE_SEED was used to create the source byte array image.

* - * @param bytes a byte array image of a Sketch that was created using the DEFAULT_UPDATE_SEED. + * @param bytes a byte array image of a CompactThetaSketch that was created using the DEFAULT_UPDATE_SEED. * - * @return a CompactSketch backed by the given byte array except as above. + * @return a CompactThetaSketch backed by the given byte array except as above. */ - public static CompactSketch wrap(final byte[] bytes) { + public static CompactThetaSketch wrap(final byte[] bytes) { return wrap(bytes, Util.DEFAULT_UPDATE_SEED); } @@ -217,12 +217,12 @@ public static CompactSketch wrap(final byte[] bytes) { * *

This method checks if the given expectedSeed was used to create the source byte array image.

* - * @param bytes a byte array image of a Sketch that was created using the given expectedSeed. + * @param bytes a byte array image of a CompactThetaSketch that was created using the given expectedSeed. * @param expectedSeed the seed used to validate the given byte array image. * See Update Hash Seed. - * @return a CompactSketch backed by the given byte array except as above. + * @return a CompactThetaSketch backed by the given byte array except as above. */ - public static CompactSketch wrap(final byte[] bytes, final long expectedSeed) { + public static CompactThetaSketch wrap(final byte[] bytes, final long expectedSeed) { final int serVer = bytes[PreambleUtil.SER_VER_BYTE]; final int familyId = bytes[PreambleUtil.FAMILY_BYTE]; final Family family = Family.idToFamily(familyId); @@ -261,10 +261,10 @@ public static CompactSketch wrap(final byte[] bytes, final long expectedSeed) { "Corrupted: Serialization Version " + serVer + " not recognized."); } - //Sketch Overrides + //ThetaSketch Overrides @Override - public abstract CompactSketch compact(final boolean dstOrdered, final MemorySegment dstSeg); + public abstract CompactThetaSketch compact(final boolean dstOrdered, final MemorySegment dstSeg); @Override public int getCompactBytes() { @@ -385,7 +385,7 @@ private byte[] toByteArrayV4() { return bytes; } - private static CompactSketch heapifyV4(final MemorySegment srcSeg, final long seed) { + private static CompactThetaSketch heapifyV4(final MemorySegment srcSeg, final long seed) { final int preLongs = ThetaSketch.getPreambleLongs(srcSeg); final int entryBits = extractEntryBitsV4(srcSeg); final int numEntriesBytes = extractNumEntriesBytesV4(srcSeg); diff --git a/src/main/java/org/apache/datasketches/theta/ConcurrentBackgroundThetaPropagation.java b/src/main/java/org/apache/datasketches/theta/ConcurrentBackgroundThetaPropagation.java index b3e863532..c12f8aa4e 100644 --- a/src/main/java/org/apache/datasketches/theta/ConcurrentBackgroundThetaPropagation.java +++ b/src/main/java/org/apache/datasketches/theta/ConcurrentBackgroundThetaPropagation.java @@ -39,7 +39,7 @@ final class ConcurrentBackgroundThetaPropagation implements Runnable { // local buffer. Updated when the propagation completes. private final AtomicBoolean localPropagationInProgress; - // Sketch to be propagated to shared sketch. Can be null if only a single hash is propagated + // ThetaSketch to be propagated to shared sketch. Can be null if only a single hash is propagated private final ThetaSketch sketchIn; // Hash of the datum to be propagated to shared sketch. Can be ConcurrentSharedThetaSketch.NOT_SINGLE_HASH diff --git a/src/main/java/org/apache/datasketches/theta/ConcurrentDirectQuickSelectSketch.java b/src/main/java/org/apache/datasketches/theta/ConcurrentDirectQuickSelectSketch.java index 76aac8d9d..5a0bbf22f 100644 --- a/src/main/java/org/apache/datasketches/theta/ConcurrentDirectQuickSelectSketch.java +++ b/src/main/java/org/apache/datasketches/theta/ConcurrentDirectQuickSelectSketch.java @@ -88,7 +88,7 @@ final class ConcurrentDirectQuickSelectSketch extends DirectQuickSelectSketch initBgPropagationService(); } - ConcurrentDirectQuickSelectSketch(final UpdateSketch sketch, final long seed, + ConcurrentDirectQuickSelectSketch(final UpdatableThetaSketch sketch, final long seed, final double maxConcurrencyError, final MemorySegment dstSeg) { super(sketch.getLgNomLongs(), seed, 1.0F, //p ResizeFactor.X1, //rf, @@ -109,7 +109,7 @@ final class ConcurrentDirectQuickSelectSketch extends DirectQuickSelectSketch updateEstimationSnapshot(); } - //Sketch overrides + //ThetaSketch overrides @Override public double getEstimate() { @@ -129,10 +129,10 @@ public byte[] toByteArray() { return res; } - //UpdateSketch overrides + //UpdatableThetaSketch overrides @Override - public UpdateSketch rebuild() { + public UpdatableThetaSketch rebuild() { super.rebuild(); updateEstimationSnapshot(); return this; diff --git a/src/main/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketch.java b/src/main/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketch.java index dddfd1548..bc7876f10 100644 --- a/src/main/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketch.java +++ b/src/main/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketch.java @@ -27,7 +27,7 @@ import org.apache.datasketches.common.SuppressFBWarnings; /** - * A concurrent shared sketch that is based on HeapQuickSelectSketch. + * A concurrent shared sketch that is based on HeapQuickSelectThetaSketch. * It reflects all data processed by a single or multiple update threads, and can serve queries at * any time. * Background propagation threads are used to propagate data from thread local buffers into this @@ -82,7 +82,7 @@ final class ConcurrentHeapQuickSelectSketch extends HeapQuickSelectSketch initBgPropagationService(); } - ConcurrentHeapQuickSelectSketch(final UpdateSketch sketch, final long seed, + ConcurrentHeapQuickSelectSketch(final UpdatableThetaSketch sketch, final long seed, final double maxConcurrencyError) { super(sketch.getLgNomLongs(), seed, 1.0F, //p ResizeFactor.X1, //rf, @@ -101,7 +101,7 @@ final class ConcurrentHeapQuickSelectSketch extends HeapQuickSelectSketch updateEstimationSnapshot(); } - //Sketch overrides + //ThetaSketch overrides @Override public double getEstimate() { @@ -121,10 +121,10 @@ public byte[] toByteArray() { return res; } - //UpdateSketch overrides + //UpdatableThetaSketch overrides @Override - public UpdateSketch rebuild() { + public UpdatableThetaSketch rebuild() { super.rebuild(); updateEstimationSnapshot(); return this; diff --git a/src/main/java/org/apache/datasketches/theta/ConcurrentHeapThetaBuffer.java b/src/main/java/org/apache/datasketches/theta/ConcurrentHeapThetaBuffer.java index 2071b74ce..ffe831020 100644 --- a/src/main/java/org/apache/datasketches/theta/ConcurrentHeapThetaBuffer.java +++ b/src/main/java/org/apache/datasketches/theta/ConcurrentHeapThetaBuffer.java @@ -42,10 +42,10 @@ * Propagation is done either synchronously by the updating thread, or asynchronously by a * background propagation thread. * - *

This is a buffer, not a sketch, and it extends the HeapQuickSelectSketch + *

This is a buffer, not a sketch, and it extends the HeapQuickSelectThetaSketch * in order to leverage some of the sketch machinery to make its work simple. However, if this * buffer receives a query, like getEstimate(), the correct answer does not come from the super - * HeapQuickSelectSketch, which knows nothing about the concurrency relationship to the + * HeapQuickSelectThetaSketch, which knows nothing about the concurrency relationship to the * shared concurrent sketch, it must come from the shared concurrent sketch. As a result nearly all * of the inherited sketch methods are redirected to the shared concurrent sketch. * @@ -111,7 +111,7 @@ private void propagateToSharedSketch() { //no inspection StatementWithEmptyBody while (localPropagationInProgress.get()) { /* busy wait until previous propagation completed */ } - final CompactSketch compactSketch = compact(propagateOrderedCompact, null); + final CompactThetaSketch compactSketch = compact(propagateOrderedCompact, null); localPropagationInProgress.set(true); shared.propagate(localPropagationInProgress, compactSketch, ConcurrentSharedThetaSketch.NOT_SINGLE_HASH); @@ -119,7 +119,7 @@ private void propagateToSharedSketch() { thetaLong_ = shared.getVolatileTheta(); } - //Public Sketch overrides proxies to shared concurrent sketch + //Public ThetaSketch overrides proxies to shared ConcurrentThetaSketch @Override public int getCompactBytes() { @@ -178,7 +178,7 @@ public byte[] toByteArray() { throw new UnsupportedOperationException("Local theta buffer need not be serialized"); } - //Public UpdateSketch overrides + //Public UpdatableThetaSketch overrides @Override public void reset() { @@ -187,7 +187,7 @@ public void reset() { localPropagationInProgress.set(false); } - //Restricted UpdateSketch overrides + //Restricted UpdatableThetaSketch overrides /** * Updates buffer with given hash value. diff --git a/src/main/java/org/apache/datasketches/theta/ConcurrentSharedThetaSketch.java b/src/main/java/org/apache/datasketches/theta/ConcurrentSharedThetaSketch.java index cef561d58..eeb207d3c 100644 --- a/src/main/java/org/apache/datasketches/theta/ConcurrentSharedThetaSketch.java +++ b/src/main/java/org/apache/datasketches/theta/ConcurrentSharedThetaSketch.java @@ -124,11 +124,11 @@ boolean propagate(final AtomicBoolean localPropagationInProgress, final ThetaSke //well as the methods below. // //For the external user all of the below methods can be obtained by casting the shared - //sketch to UpdateSketch. However, these methods here also act as an alias so that an + //sketch to UpdatableThetaSketch. However, these methods here also act as an alias so that an //attempt to access these methods from the local buffer will be diverted to the shared //sketch. - //From Sketch and MemoryStatus + //From ThetaSketch and MemoryStatus int getCompactBytes(); @@ -148,11 +148,11 @@ boolean propagate(final AtomicBoolean localPropagationInProgress, final ThetaSke int getRetainedEntries(boolean valid); - CompactSketch compact(); + CompactThetaSketch compact(); - CompactSketch compact(boolean ordered, MemorySegment wseg); + CompactThetaSketch compact(boolean ordered, MemorySegment wseg); - UpdateSketch rebuild(); + UpdatableThetaSketch rebuild(); void reset(); } diff --git a/src/main/java/org/apache/datasketches/theta/DirectCompactCompressedSketch.java b/src/main/java/org/apache/datasketches/theta/DirectCompactCompressedSketch.java index f0b850eb7..9f37241d2 100644 --- a/src/main/java/org/apache/datasketches/theta/DirectCompactCompressedSketch.java +++ b/src/main/java/org/apache/datasketches/theta/DirectCompactCompressedSketch.java @@ -49,7 +49,7 @@ final class DirectCompactCompressedSketch extends DirectCompactSketch { } /** - * Wraps the given MemorySegment, which must be a SerVer 4 compressed CompactSketch image. + * Wraps the given MemorySegment, which must be a SerVer 4 compressed CompactThetaSketch image. * Must check the validity of the MemorySegment before calling. * @param srcSeg The source MemorySegment * @param seedHash The update seedHash. @@ -61,15 +61,15 @@ static DirectCompactCompressedSketch wrapInstance(final MemorySegment srcSeg, fi return new DirectCompactCompressedSketch(srcSeg); } - //Sketch Overrides + //ThetaSketch Overrides @Override - public CompactSketch compact(final boolean dstOrdered, final MemorySegment dstSeg) { + public CompactThetaSketch compact(final boolean dstOrdered, final MemorySegment dstSeg) { if (dstSeg != null) { MemorySegment.copy(seg_, 0, dstSeg, 0, getCurrentBytes()); return new DirectCompactSketch(dstSeg); } - return CompactSketch.heapify(seg_, Util.DEFAULT_UPDATE_SEED); + return CompactThetaSketch.heapify(seg_, Util.DEFAULT_UPDATE_SEED); } @Override @@ -84,7 +84,7 @@ public int getCurrentBytes() { private static final int START_PACKED_DATA_ESTIMATION_MODE = 16; @Override - public int getRetainedEntries(final boolean valid) { //valid is only relevant for the Alpha Sketch + public int getRetainedEntries(final boolean valid) { //valid is only relevant for the AlphaSketch // number of entries is stored using variable length encoding // most significant bytes with all zeros are not stored // one byte in the preamble has the number of non-zero bytes used diff --git a/src/main/java/org/apache/datasketches/theta/DirectCompactSketch.java b/src/main/java/org/apache/datasketches/theta/DirectCompactSketch.java index b5794aeb6..749d8dfed 100644 --- a/src/main/java/org/apache/datasketches/theta/DirectCompactSketch.java +++ b/src/main/java/org/apache/datasketches/theta/DirectCompactSketch.java @@ -47,7 +47,7 @@ * * @author Lee Rhodes */ -class DirectCompactSketch extends CompactSketch { +class DirectCompactSketch extends CompactThetaSketch { final MemorySegment seg_; /** @@ -59,7 +59,7 @@ class DirectCompactSketch extends CompactSketch { } /** - * Wraps the given MemorySegment, which must be a SerVer 3, CompactSketch image. + * Wraps the given MemorySegment, which must be a SerVer 3, CompactThetaSketch image. * Must check the validity of the MemorySegment before calling. The order bit must be set properly. * @param srcSeg the given MemorySegment * @param seedHash The update seedHash. @@ -71,10 +71,10 @@ static DirectCompactSketch wrapInstance(final MemorySegment srcSeg, final short return new DirectCompactSketch(srcSeg); } - //Sketch Overrides + //ThetaSketch Overrides @Override - public CompactSketch compact(final boolean dstOrdered, final MemorySegment dstSeg) { + public CompactThetaSketch compact(final boolean dstOrdered, final MemorySegment dstSeg) { return segmentToCompact(seg_, dstOrdered, dstSeg); } @@ -87,7 +87,7 @@ public int getCurrentBytes() { } @Override - public int getRetainedEntries(final boolean valid) { //valid is only relevant for the Alpha Sketch + public int getRetainedEntries(final boolean valid) { //valid is only relevant for the AlphaSketch if (checkForSingleItem(seg_)) { return 1; } final int preLongs = ThetaSketch.getPreambleLongs(seg_); return (preLongs == 1) ? 0 : extractCurCount(seg_); diff --git a/src/main/java/org/apache/datasketches/theta/DirectQuickSelectSketch.java b/src/main/java/org/apache/datasketches/theta/DirectQuickSelectSketch.java index d1cbb740f..2172a1f65 100644 --- a/src/main/java/org/apache/datasketches/theta/DirectQuickSelectSketch.java +++ b/src/main/java/org/apache/datasketches/theta/DirectQuickSelectSketch.java @@ -68,7 +68,7 @@ import org.apache.datasketches.thetacommon.ThetaUtil; /** - * The default Theta Sketch using the QuickSelect algorithm. + * The UpdatableThetaSketch using the QuickSelect algorithm in a MemorySegment. * This subclass implements methods, which affect the state (update, rebuild, reset) * *

This implementation uses data in a given MemorySegment that is owned and managed by the caller. @@ -110,8 +110,8 @@ private DirectQuickSelectSketch( * @param dstSeg the given MemorySegment object destination. It cannot be null. * It will be cleared prior to use. * @param mSegReq an implementation of the MemorySegmentRequest interface or null. - * @param unionGadget true if this sketch is implementing the Union gadget function. - * Otherwise, it is behaving as a normal QuickSelectSketch. + * @param unionGadget true if this sketch is implementing the ThetaUnion gadget function. + * Otherwise, it is behaving as a normal QuickSelectThetaSketch. */ DirectQuickSelectSketch( final int lgNomLongs, @@ -170,7 +170,7 @@ private DirectQuickSelectSketch( * @param seed See Update Hash Seed * @return instance of this sketch */ - //called from UnionImpl and UpdateSketch + //called from ThetaUnionImpl and UpdatableThetaSketch static DirectQuickSelectSketch writableWrap( final MemorySegment srcSeg, final MemorySegmentRequest mSegReq, @@ -179,7 +179,7 @@ static DirectQuickSelectSketch writableWrap( final int lgNomLongs = extractLgNomLongs(srcSeg); //byte 3 final int lgArrLongs = extractLgArrLongs(srcSeg); //byte 4 - UpdateSketch.checkUnionAndQuickSelectFamily(srcSeg, preambleLongs, lgNomLongs); + UpdatableThetaSketch.checkUnionAndQuickSelectFamily(srcSeg, preambleLongs, lgNomLongs); checkSegIntegrity(srcSeg, seed, preambleLongs, lgNomLongs, lgArrLongs); if (isResizeFactorIncorrect(srcSeg, lgNomLongs, lgArrLongs)) { @@ -200,7 +200,7 @@ static DirectQuickSelectSketch writableWrap( * @param seed See Update Hash Seed * @return instance of this sketch */ - //called from UnionImpl <- Union + //called from ThetaUnionImpl <- ThetaUnion static DirectQuickSelectSketch fastWritableWrap( final MemorySegment srcSeg, final MemorySegmentRequest mSegReq, @@ -213,12 +213,12 @@ static DirectQuickSelectSketch fastWritableWrap( return dqss; } - //Sketch + //ThetaSketch - //UpdateSketch + //UpdatableThetaSketch @Override - public UpdateSketch rebuild() { + public UpdatableThetaSketch rebuild() { final int lgNomLongs = getLgNomLongs(); final int preambleLongs = wseg_.get(JAVA_BYTE, PREAMBLE_LONGS_BYTE) & 0X3F; if (getRetainedEntries(true) > 1 << lgNomLongs) { diff --git a/src/main/java/org/apache/datasketches/theta/DirectQuickSelectSketchR.java b/src/main/java/org/apache/datasketches/theta/DirectQuickSelectSketchR.java index 7b07d660f..37fabf844 100644 --- a/src/main/java/org/apache/datasketches/theta/DirectQuickSelectSketchR.java +++ b/src/main/java/org/apache/datasketches/theta/DirectQuickSelectSketchR.java @@ -33,11 +33,11 @@ import static org.apache.datasketches.theta.PreambleUtil.P_FLOAT; import static org.apache.datasketches.theta.PreambleUtil.RETAINED_ENTRIES_INT; import static org.apache.datasketches.theta.PreambleUtil.THETA_LONG; +import static org.apache.datasketches.theta.PreambleUtil.checkSegPreambleCap; import static org.apache.datasketches.theta.PreambleUtil.extractCurCount; import static org.apache.datasketches.theta.PreambleUtil.extractLgArrLongs; import static org.apache.datasketches.theta.PreambleUtil.extractLgNomLongs; import static org.apache.datasketches.theta.PreambleUtil.extractThetaLong; -import static org.apache.datasketches.theta.PreambleUtil.checkSegPreambleCap; import static org.apache.datasketches.theta.PreambleUtil.insertThetaLong; import java.lang.foreign.MemorySegment; @@ -49,7 +49,7 @@ import org.apache.datasketches.common.SketchesReadOnlyException; /** - * The read-only Theta Sketch. + * The read-only ThetaSketch in a MemorySegment. * *

This implementation uses data in a given MemorySegment that is owned and managed by the caller. * This MemorySegment can be off-heap, which if managed properly will greatly reduce the need for @@ -58,12 +58,12 @@ * @author Lee Rhodes * @author Kevin Lang */ -class DirectQuickSelectSketchR extends UpdateSketch { +class DirectQuickSelectSketchR extends UpdatableThetaSketch { /** - * This MemorySegment reference is also used by the writable child DirectQuickSelectSketch. + * This MemorySegment reference is also used by the writable child DirectQuickSelectThetaSketch. * - *

When this class is constructed with the writable constructor, called by the writable child DirectQuickSelectSketch, + *

When this class is constructed with the writable constructor, called by the writable child DirectQuickSelectThetaSketch, * this reference can be changed, its contents can be modified.

* *

When this class is constructed with the read-only constructor, called from local factories, this MemorySegment will @@ -72,10 +72,10 @@ class DirectQuickSelectSketchR extends UpdateSketch { MemorySegment wseg_; // /** - * This writable constructor is only called by the writable child DirectQuickSelectSketch and then this class provides the - * read-only methods for the DirectQuickSelectSketch class. - * @param wseg the writable MemorySegment used by the writable child DirectQuickSelectSketch. - * @param seed the seed for the update function for the writable child DirectQuickSelectSketch. + * This writable constructor is only called by the writable child DirectQuickSelectThetaSketch and then this class provides the + * read-only methods for the DirectQuickSelectThetaSketch class. + * @param wseg the writable MemorySegment used by the writable child DirectQuickSelectThetaSketch. + * @param seed the seed for the update function for the writable child DirectQuickSelectThetaSketch. */ DirectQuickSelectSketchR(final MemorySegment wseg, final long seed) { Objects.requireNonNull(wseg, "MemorySegment wseg must not be null"); @@ -106,7 +106,7 @@ static DirectQuickSelectSketchR readOnlyWrap(final MemorySegment srcSeg, final l final int lgNomLongs = extractLgNomLongs(srcSeg); //byte 3 final int lgArrLongs = extractLgArrLongs(srcSeg); //byte 4 checkSegIntegrity(srcSeg, seed, preambleLongs, lgNomLongs, lgArrLongs); - UpdateSketch.checkUnionAndQuickSelectFamily(srcSeg, preambleLongs, lgNomLongs); + UpdatableThetaSketch.checkUnionAndQuickSelectFamily(srcSeg, preambleLongs, lgNomLongs); return new DirectQuickSelectSketchR(seed, srcSeg); } @@ -122,7 +122,7 @@ static DirectQuickSelectSketchR fastReadOnlyWrap(final MemorySegment srcSeg, fin return new DirectQuickSelectSketchR(seed, srcSeg); } - //Sketch + //ThetaSketch @Override public int getCurrentBytes() { @@ -146,7 +146,7 @@ public Family getFamily() { } @Override - public int getRetainedEntries(final boolean valid) { //valid is only relevant for the Alpha Sketch + public int getRetainedEntries(final boolean valid) { //valid is only relevant for the AlphaSketch return wseg_.get(JAVA_INT_UNALIGNED, RETAINED_ENTRIES_INT); } @@ -193,7 +193,7 @@ public byte[] toByteArray() { //MY_FAMILY is stored in wseg_ return byteArray; } - //UpdateSketch + //UpdatableThetaSketch @Override public final int getLgNomLongs() { @@ -211,7 +211,7 @@ public ResizeFactor getResizeFactor() { } @Override - public UpdateSketch rebuild() { + public UpdatableThetaSketch rebuild() { throw new SketchesReadOnlyException(); } @@ -253,7 +253,7 @@ short getSeedHash() { @Override boolean isDirty() { - return false; //Always false for QuickSelectSketch + return false; //Always false for QuickSelectThetaSketch } @Override diff --git a/src/main/java/org/apache/datasketches/theta/EmptyCompactSketch.java b/src/main/java/org/apache/datasketches/theta/EmptyCompactSketch.java index 793ce1763..a5ffed2f7 100644 --- a/src/main/java/org/apache/datasketches/theta/EmptyCompactSketch.java +++ b/src/main/java/org/apache/datasketches/theta/EmptyCompactSketch.java @@ -27,11 +27,11 @@ import org.apache.datasketches.common.SketchesArgumentException; /** - * Singleton empty CompactSketch. + * Singleton empty CompactThetaSketch. * * @author Lee Rhodes */ -final class EmptyCompactSketch extends CompactSketch { +final class EmptyCompactSketch extends CompactThetaSketch { //For backward compatibility, a candidate long must have Flags= compact, read-only, // COMPACT-Family=3, SerVer=3, PreLongs=1, and be exactly 8 bytes long. The seedHash is ignored. @@ -64,7 +64,7 @@ static synchronized EmptyCompactSketch getHeapInstance(final MemorySegment srcSe // This returns with ordered flag = true independent of dstOrdered. // This is required for fast detection. // The hashSeed is ignored and set == 0. - public CompactSketch compact(final boolean dstOrdered, final MemorySegment dstWSeg) { + public CompactThetaSketch compact(final boolean dstOrdered, final MemorySegment dstWSeg) { if (dstWSeg == null) { return EmptyCompactSketch.getInstance(); } //dstWSeg.putByteArray(0, EMPTY_COMPACT_SKETCH_ARR, 0, 8); MemorySegment.copy(EMPTY_COMPACT_SKETCH_ARR, 0, dstWSeg, JAVA_BYTE, 0, 8); @@ -86,7 +86,7 @@ public int getCurrentBytes() { public double getEstimate() { return 0; } @Override - public int getRetainedEntries(final boolean valid) { //valid is only relevant for the Alpha Sketch + public int getRetainedEntries(final boolean valid) { //valid is only relevant for the AlphaSketch return 0; } @@ -111,7 +111,7 @@ public HashIterator iterator() { } /** - * Returns 8 bytes representing a CompactSketch that the following flags set: + * Returns 8 bytes representing a CompactThetaSketch that the following flags set: * ordered, compact, empty, readOnly. The SerVer is 3, the Family is COMPACT(3), * and the PreLongs = 1. The seedHash is zero. */ diff --git a/src/main/java/org/apache/datasketches/theta/HeapAlphaSketch.java b/src/main/java/org/apache/datasketches/theta/HeapAlphaSketch.java index 846fb02b6..8b64b177f 100644 --- a/src/main/java/org/apache/datasketches/theta/HeapAlphaSketch.java +++ b/src/main/java/org/apache/datasketches/theta/HeapAlphaSketch.java @@ -50,7 +50,7 @@ /** * This sketch uses the - * Theta Sketch Framework + * ThetaSketch Framework * and the * Alpha TCF algorithm * with a single cache. @@ -164,7 +164,7 @@ static HeapAlphaSketch heapifyInstance(final MemorySegment srcSeg, final long ex return has; } - //Sketch + //ThetaSketch @Override public Family getFamily() { @@ -208,7 +208,7 @@ public double getLowerBound(final int numStdDev) { } @Override - public int getRetainedEntries(final boolean valid) { //valid is only relevant for the Alpha Sketch + public int getRetainedEntries(final boolean valid) { //valid is only relevant for the AlphaSketch if (curCount_ > 0) { if (valid && isDirty()) { return HashOperations.countPart(getCache(), getLgArrLongs(), getThetaLong()); @@ -241,7 +241,7 @@ public boolean isEmpty() { } /* - * Alpha Sketch Preamble Layout ( same as Theta UpdateSketch ) + * AlphaSketch Preamble Layout ( same as UpdatableThetaSketch ) * 

    * Long || Start Byte Adr:
    * Adr:
@@ -261,10 +261,10 @@ public byte[] toByteArray() {
     return toByteArray(Family.ALPHA.getMinPreLongs(), (byte) Family.ALPHA.getID());
   }
 
-  //UpdateSketch
+  //UpdatableThetaSketch
 
   @Override
-  public UpdateSketch rebuild() {
+  public UpdatableThetaSketch rebuild() {
     if (isDirty()) {
       rebuildDirty();
     }
@@ -348,7 +348,7 @@ UpdateReturnState hashUpdate(final long hash) {
     if (r == 0) { //not yet sketch mode (has not seen k+1 inserts), but could be sampling
       if (curCount_ > (1 << lgNomLongs_)) { // > k
         //Reached the k+1 insert. Must be at tgt size or larger.
-        //Transition to Sketch Mode. Happens only once.
+        //Transition to ThetaSketch Mode. Happens only once.
         //Decrement theta, make dirty, don't bother check size, already not-empty.
         thetaLong_ = (long) (thetaLong_ * alpha_);
         dirty_ = true; //now may have dirty values
@@ -507,12 +507,12 @@ private void forceRebuildDirtyCache() {
    * Table of sketch states and how Upper and Lower Bounds are computed
    *
    * Theta P    Count  Empty  EstMode Est   UB  LB   Comments
-   * 1.0   1.0  0      T      F       0     0   0    Empty Sketch-mode only sketch
-   * 1.0   1.0  N      F      F       N     N   N    Degenerate Sketch-mode only sketch
-   * <1.0  1.0  -      F      T       est   HIP HIP  Normal Sketch-mode only sketch
-   *  P    <1.0 0      T      F       0     0   0    Virgin sampling sketch
-   *  P    <1.0 N      F      T       est   HIP HIP  Degenerate sampling sketch
-   *  <P   <1.0 N      F      T       est   HIP HIP  Sampling sketch also in sketch-mode
+   * 1.0   1.0  0      T      F       0     0   0    Empty sketch-mode only ThetaSketch
+   * 1.0   1.0  N      F      F       N     N   N    Degenerate sketch-mode only ThetaSketch
+   * <1.0  1.0  -      F      T       est   HIP HIP  Normal sketch-mode only ThetaSketch
+   *  P    <1.0 0      T      F       0     0   0    Virgin sampling ThetaSketch
+   *  P    <1.0 N      F      T       est   HIP HIP  Degenerate sampling ThetaSketch
+   *  <P   <1.0 N      F      T       est   HIP HIP  Sampling ThetaSketch also in sketch-mode
    *
* @param k alias for nominal entries. * @param p See Sampling Probability, p. diff --git a/src/main/java/org/apache/datasketches/theta/HeapCompactSketch.java b/src/main/java/org/apache/datasketches/theta/HeapCompactSketch.java index 69eebff5f..2e0fed42f 100644 --- a/src/main/java/org/apache/datasketches/theta/HeapCompactSketch.java +++ b/src/main/java/org/apache/datasketches/theta/HeapCompactSketch.java @@ -34,11 +34,11 @@ import java.lang.foreign.MemorySegment; /** - * Parent class of the Heap Compact Sketches. + * Parent class of the HeapCompactThetaSketches. * * @author Lee Rhodes */ -final class HeapCompactSketch extends CompactSketch { +final class HeapCompactSketch extends CompactThetaSketch { private final long thetaLong_; //computed private final int curCount_; private final int preLongs_; //computed @@ -73,10 +73,10 @@ final class HeapCompactSketch extends CompactSketch { checkIllegalCurCountAndEmpty(empty, curCount); } - //Sketch + //ThetaSketch @Override - public CompactSketch compact(final boolean dstOrdered, final MemorySegment dstSeg) { + public CompactThetaSketch compact(final boolean dstOrdered, final MemorySegment dstSeg) { if ((dstSeg == null) && (!dstOrdered || (ordered_ == dstOrdered))) { return this; } return componentsToCompact(getThetaLong(), getRetainedEntries(true), getSeedHash(), isEmpty(), true, ordered_, dstOrdered, dstSeg, getCache().clone()); @@ -88,7 +88,7 @@ public int getCurrentBytes() { } @Override - public int getRetainedEntries(final boolean valid) { //valid is only relevant for the Alpha Sketch + public int getRetainedEntries(final boolean valid) { //valid is only relevant for the AlphaSketch return curCount_; } diff --git a/src/main/java/org/apache/datasketches/theta/HeapQuickSelectSketch.java b/src/main/java/org/apache/datasketches/theta/HeapQuickSelectSketch.java index 89f4f21f5..a44ac9764 100644 --- a/src/main/java/org/apache/datasketches/theta/HeapQuickSelectSketch.java +++ b/src/main/java/org/apache/datasketches/theta/HeapQuickSelectSketch.java @@ -74,8 +74,8 @@ private HeapQuickSelectSketch(final int lgNomLongs, final long seed, final float * @param seed See seed * @param p See Sampling Probability, p * @param rf See Resize Factor - * @param unionGadget true if this sketch is implementing the Union gadget function. - * Otherwise, it is behaving as a normal QuickSelectSketch. + * @param unionGadget true if this sketch is implementing the ThetaUnion gadget function. + * Otherwise, it is behaving as a normal QuickSelectThetaSketch. */ HeapQuickSelectSketch(final int lgNomLongs, final long seed, final float p, final ResizeFactor rf, final boolean unionGadget) { @@ -100,7 +100,7 @@ private HeapQuickSelectSketch(final int lgNomLongs, final long seed, final float } /** - * Heapify a sketch from a MemorySegment UpdateSketch or Union object + * Heapify a sketch from a MemorySegment UpdatableThetaSketch or ThetaUnion object * containing sketch data. * @param srcSeg The source MemorySegment object. * @param seed See seed @@ -136,7 +136,7 @@ static HeapQuickSelectSketch heapifyInstance(final MemorySegment srcSeg, final l return hqss; } - //Sketch + //ThetaSketch @Override public double getEstimate() { @@ -149,7 +149,7 @@ public Family getFamily() { } @Override - public int getRetainedEntries(final boolean valid) { //valid is only relevant for the Alpha Sketch + public int getRetainedEntries(final boolean valid) { //valid is only relevant for the AlphaSketch return curCount_; } @@ -173,10 +173,10 @@ public byte[] toByteArray() { return toByteArray(preambleLongs_, (byte) MY_FAMILY.getID()); } - //UpdateSketch + //UpdatableThetaSketch @Override - public UpdateSketch rebuild() { + public UpdatableThetaSketch rebuild() { if (getRetainedEntries(true) > (1 << getLgNomLongs())) { quickSelectAndRebuild(); } diff --git a/src/main/java/org/apache/datasketches/theta/HeapUpdateSketch.java b/src/main/java/org/apache/datasketches/theta/HeapUpdateSketch.java index 56175a019..e676a6652 100644 --- a/src/main/java/org/apache/datasketches/theta/HeapUpdateSketch.java +++ b/src/main/java/org/apache/datasketches/theta/HeapUpdateSketch.java @@ -43,11 +43,11 @@ import org.apache.datasketches.thetacommon.ThetaUtil; /** - * The parent class for Heap Updatable Theta Sketches. + * The parent class for HeapUpdatableThetaSketches. * * @author Lee Rhodes */ -abstract class HeapUpdateSketch extends UpdateSketch { +abstract class HeapUpdateSketch extends UpdatableThetaSketch { final int lgNomLongs_; private final float p_; private final ResizeFactor rf_; @@ -59,7 +59,7 @@ abstract class HeapUpdateSketch extends UpdateSketch { rf_ = rf; } - //Sketch + //ThetaSketch @Override public int getCurrentBytes() { @@ -68,7 +68,7 @@ public int getCurrentBytes() { return preLongs + dataLongs << 3; } - //UpdateSketch + //UpdatableThetaSketch @Override public final int getLgNomLongs() { @@ -92,7 +92,7 @@ short getSeedHash() { return Util.computeSeedHash(getSeed()); } - //Used by HeapAlphaSketch and HeapQuickSelectSketch / Theta UpdateSketch + //Used by HeapAlphaSketch and HeapQuickSelectThetaSketch / UpdatableThetaSketch byte[] toByteArray(final int preLongs, final byte familyID) { if (isDirty()) { rebuild(); } checkIllegalCurCountAndEmpty(isEmpty(), getRetainedEntries(true)); diff --git a/src/main/java/org/apache/datasketches/theta/JaccardSimilarity.java b/src/main/java/org/apache/datasketches/theta/JaccardSimilarity.java index 0a71d6fbc..2fc9d4fe5 100644 --- a/src/main/java/org/apache/datasketches/theta/JaccardSimilarity.java +++ b/src/main/java/org/apache/datasketches/theta/JaccardSimilarity.java @@ -29,7 +29,7 @@ import org.apache.datasketches.thetacommon.ThetaUtil; /** - * Jaccard similarity of two Theta Sketches. + * Jaccard similarity of two ThetaSketches. * * @author Lee Rhodes */ @@ -64,12 +64,12 @@ public static double[] jaccard(final ThetaSketch sketchA, final ThetaSketch sket final int countA = sketchA.getRetainedEntries(true); final int countB = sketchB.getRetainedEntries(true); - //Create the Union + //Create the ThetaUnion final int minK = 1 << ThetaUtil.MIN_LG_NOM_LONGS; final int maxK = 1 << ThetaUtil.MAX_LG_NOM_LONGS; final int newK = max(min(ceilingPowerOf2(countA + countB), maxK), minK); - final Union union = - SetOperation.builder().setNominalEntries(newK).buildUnion(); + final ThetaUnion union = + ThetaSetOperation.builder().setNominalEntries(newK).buildUnion(); union.union(sketchA); union.union(sketchB); final ThetaSketch unionAB = union.getResult(false, null); @@ -84,8 +84,8 @@ public static double[] jaccard(final ThetaSketch sketchA, final ThetaSketch sket return ONES.clone(); } - //Create the Intersection - final Intersection inter = SetOperation.builder().buildIntersection(); + //Create the ThetaIntersection + final ThetaIntersection inter = ThetaSetOperation.builder().buildIntersection(); inter.intersect(sketchA); inter.intersect(sketchB); inter.intersect(unionAB); //ensures that intersection is a subset of the union @@ -115,9 +115,9 @@ public static boolean exactlyEqual(final ThetaSketch sketchA, final ThetaSketch final int countA = sketchA.getRetainedEntries(true); final int countB = sketchB.getRetainedEntries(true); - //Create the Union - final Union union = - SetOperation.builder().setNominalEntries(ceilingPowerOf2(countA + countB)).buildUnion(); + //Create the ThetaUnion + final ThetaUnion union = + ThetaSetOperation.builder().setNominalEntries(ceilingPowerOf2(countA + countB)).buildUnion(); union.union(sketchA); union.union(sketchB); final ThetaSketch unionAB = union.getResult(); @@ -135,7 +135,7 @@ public static boolean exactlyEqual(final ThetaSketch sketchA, final ThetaSketch } /** - * Tests similarity of a measured Sketch against an expected Sketch. + * Tests similarity of a measured ThetaSketch against an expected ThetaSketch. * Computes the lower bound of the Jaccard index JLB of the measured and * expected sketches. * if JLB ≥ threshold, then the sketches are considered to be @@ -157,7 +157,7 @@ public static boolean similarityTest(final ThetaSketch measured, final ThetaSket } /** - * Tests dissimilarity of a measured Sketch against an expected Sketch. + * Tests dissimilarity of a measured ThetaSketch against an expected ThetaSketch. * Computes the upper bound of the Jaccard index JUB of the measured and * expected sketches. * if JUB ≤ threshold, then the sketches are considered to be diff --git a/src/main/java/org/apache/datasketches/theta/PreambleUtil.java b/src/main/java/org/apache/datasketches/theta/PreambleUtil.java index 4dd993eb3..fcb7f24a4 100644 --- a/src/main/java/org/apache/datasketches/theta/PreambleUtil.java +++ b/src/main/java/org/apache/datasketches/theta/PreambleUtil.java @@ -41,7 +41,7 @@ * fields. * *

The intent of the design of this class was to isolate the detailed knowledge of the bit and - * byte layout of the serialized form of the sketches derived from the Sketch class into one place. + * byte layout of the serialized form of the sketches derived from the ThetaSketch class into one place. * This allows the possibility of the introduction of different serialization * schemes with minimal impact on the rest of the library.

* @@ -50,7 +50,7 @@ * multi-byte integers (int and long) are stored in native byte order. The * byte values are treated as unsigned.

* - *

An empty CompactSketch only requires 8 bytes. + *

An empty CompactThetaSketch only requires 8 bytes. * Flags: notSI, Ordered*, Compact, Empty*, ReadOnly, LE. * (*) Earlier versions did not set these.

* @@ -61,7 +61,7 @@ * 0 || Seed Hash | Flags | | | FamID | SerVer | PreLongs = 1 | * * - *

A SingleItemSketch (extends CompactSketch) requires an 8 byte preamble plus a single + *

A SingleItemThetaSketch (extends CompactThetaSketch) requires an 8 byte preamble plus a single * hash item of 8 bytes. Flags: SingleItem*, Ordered, Compact, notEmpty, ReadOnly, LE. * (*) Earlier versions did not set these.

* @@ -75,7 +75,7 @@ * 1 ||---------------------------Single long hash----------------------------------------| * * - *

An exact (non-estimating) CompactSketch requires 16 bytes of preamble plus a compact array of + *

An exact (non-estimating) CompactThetaSketch requires 16 bytes of preamble plus a compact array of * longs.

* * 
@@ -91,7 +91,7 @@
  *  2   ||----------------------Start of Compact Long Array----------------------------------|
  *
* - *

An estimating CompactSketch requires 24 bytes of preamble plus a compact array of longs.

+ *

An estimating CompactThetaSketch requires 24 bytes of preamble plus a compact array of longs.

* * 
  * Long || Start Byte Adr:
@@ -109,7 +109,7 @@
  *  3   ||----------------------Start of Compact Long Array----------------------------------|
  *
* - *

The compressed CompactSketch has 8 bytes of preamble in exact mode because Theta can + *

The compressed CompactThetaSketch has 8 bytes of preamble in exact mode because theta can * be assumed to be 1.0. In estimating mode, the 2nd 8 bytes is Theta as a Long. The following * table assumes estimating mode. In any case the number of retained entries starts immediately * after, followed immediately by the delta encoded compressed byte array.

@@ -139,10 +139,10 @@ * 3 ||--------Delta encoded compressed byte array starts at bytes 17-20------------------| * * - *

The UpdateSketch and AlphaSketch require 24 bytes of preamble followed by a non-compact + *

The UpdatableThetaSketch and AlphaSketch require 24 bytes of preamble followed by a non-compact * array of longs representing a hash table.

* - *

The following table applies to both the Theta UpdateSketch and the Alpha Sketch

+ *

The following table applies to both the Theta UpdatableThetaSketch and the AlphaSketch

* 
  * Long || Start Byte Adr:
  * Adr:
@@ -159,7 +159,7 @@
  *  3   ||----------------------Start of Hash Table of longs---------------------------------|
  *
* - *

Union objects require 32 bytes of preamble plus a non-compact array of longs representing a + *

ThetaUnion objects require 32 bytes of preamble plus a non-compact array of longs representing a * hash table.

* * 
@@ -201,7 +201,7 @@ private PreambleUtil() {}
   static final int RETAINED_ENTRIES_INT       = 8;  //8 byte aligned
   static final int P_FLOAT                    = 12; //4 byte aligned, not used by compact
   static final int THETA_LONG                 = 16; //8-byte aligned
-  static final int UNION_THETA_LONG           = 24; //8-byte aligned, only used by Union
+  static final int UNION_THETA_LONG           = 24; //8-byte aligned, only used by ThetaUnion
 
   // flag byte bit masks
   static final int RESERVED_FLAG_MASK   = 1; //Bit 0: Reserved, no longer used. Was BigEndian
@@ -283,17 +283,17 @@ static String preambleToString(final MemorySegment seg) {
     long thetaLong = Long.MAX_VALUE;  //preLongs 1 or 2
     long thetaULong = thetaLong;      //preLongs 1, 2 or 3
 
-    if (preLongs == 2) { //exact (non-estimating) CompactSketch
+    if (preLongs == 2) { //exact (non-estimating) CompactThetaSketch
       curCount = extractCurCount(seg);
       p = extractP(seg);
     }
-    else if (preLongs == 3) { //Update Sketch
+    else if (preLongs == 3) { //UpdatableThetaSketch
       curCount = extractCurCount(seg);
       p = extractP(seg);
       thetaLong = extractThetaLong(seg);
       thetaULong = thetaLong;
     }
-    else if (preLongs == 4) { //Union
+    else if (preLongs == 4) { //ThetaUnion
       curCount = extractCurCount(seg);
       p = extractP(seg);
       thetaLong = extractThetaLong(seg);
@@ -352,7 +352,7 @@ else if (preLongs == 3) {
         return sb.toString();
       }
     }
-    else { //preLongs == 4 (Union)
+    else { //preLongs == 4 (ThetaUnion)
       sb.append("Bytes 8-11 : CurrentCount     : ").append(curCount).append(LS);
       sb.append("Bytes 12-15: P                : ").append(p).append(LS);
       sb.append("Bytes 16-23: Theta (double)   : ").append(thetaDbl).append(LS);
diff --git a/src/main/java/org/apache/datasketches/theta/SingleItemSketch.java b/src/main/java/org/apache/datasketches/theta/SingleItemSketch.java
index 766e1850d..57112fedd 100644
--- a/src/main/java/org/apache/datasketches/theta/SingleItemSketch.java
+++ b/src/main/java/org/apache/datasketches/theta/SingleItemSketch.java
@@ -37,11 +37,11 @@
 import org.apache.datasketches.common.Util;
 
 /**
- * A CompactSketch that holds only one item hash.
+ * A CompactThetaSketch that holds only one item hash.
  *
  * @author Lee Rhodes
  */
-final class SingleItemSketch extends CompactSketch {
+final class SingleItemSketch extends CompactThetaSketch {
   private static final long DEFAULT_SEED_HASH = Util.computeSeedHash(Util.DEFAULT_UPDATE_SEED) & 0xFFFFL;
 
   // For backward compatibility, a candidate pre0_ long must have:
@@ -49,7 +49,7 @@ final class SingleItemSketch extends CompactSketch {
   // Flags mask will be 0x1F.
   // SingleItem flag may not be set due to a historical bug, so we can't depend on it for now.
   // However, if the above flags are correct, preLongs == 1, SerVer >= 3, FamilyID == 3,
-  // and the hash seed matches, it is virtually guaranteed that we have a SingleItem Sketch.
+  // and the hash seed matches, it is virtually guaranteed that we have a SingleItemThetaSketch.
 
   private static final long PRE0_LO6_SI   = 0X00_00_3A_00_00_03_03_01L; //low 6 bytes, with SI flag
   private long pre0_ = 0;
@@ -76,12 +76,12 @@ private SingleItemSketch(final long hash) {
   }
 
   /**
-   * Creates a SingleItemSketch on the heap given a SingleItemSketch MemorySegment image and a seedHash.
+   * Creates a SingleItemSketch on the heap given a SingleItemThetaSketch MemorySegment image and a seedHash.
    * Checks the seed hash of the given MemorySegment against the given seedHash.
    * @param srcSeg the MemorySegment to be heapified.
    * @param expectedSeedHash the given seedHash to be checked against the srcSeg seedHash
-   * @return a SingleItemSketch
-   */ //does not override Sketch
+   * @return a SingleItemThetaSketch
+   */ //does not override ThetaSketch
   static SingleItemSketch heapify(final MemorySegment srcSeg, final short expectedSeedHash) {
     Util.checkSeedHashes((short) extractSeedHash(srcSeg), expectedSeedHash);
     final boolean singleItem = checkForSingleItem(srcSeg);
@@ -90,7 +90,7 @@ static SingleItemSketch heapify(final MemorySegment srcSeg, final short expected
   }
 
   @Override
-  public CompactSketch compact(final boolean dstOrdered, final MemorySegment dstSeg) {
+  public CompactThetaSketch compact(final boolean dstOrdered, final MemorySegment dstSeg) {
     if (dstSeg == null) { return this; }
     else {
       dstSeg.set(JAVA_LONG_UNALIGNED, 0, pre0_);
@@ -105,7 +105,7 @@ public CompactSketch compact(final boolean dstOrdered, final MemorySegment dstSe
    * Create this sketch with a long.
    *
    * @param datum The given long datum.
-   * @return a SingleItemSketch
+   * @return a SingleItemThetaSketch
    */
   static SingleItemSketch create(final long datum) {
     final long[] data = { datum };
@@ -120,7 +120,7 @@ static SingleItemSketch create(final long datum) {
    * The special floating-point values NaN and +/- Infinity are treated as distinct.
    *
    * @param datum The given double datum.
-   * @return a SingleItemSketch
+   * @return a SingleItemThetaSketch
    */
   static SingleItemSketch create(final double datum) {
     final double d = (datum == 0.0) ? 0.0 : datum; // canonicalize -0.0, 0.0
@@ -138,7 +138,7 @@ static SingleItemSketch create(final double datum) {
    * 

    *
    * @param datum The given String.
-   * @return a SingleItemSketch or null
+   * @return a SingleItemThetaSketch or null
    */
   static SingleItemSketch create(final String datum) {
     if ((datum == null) || datum.isEmpty()) { return null; }
@@ -151,7 +151,7 @@ static SingleItemSketch create(final String datum) {
    * If the byte array is null or empty no create attempt is made and the method returns null.
    *
    * @param data The given byte array.
-   * @return a SingleItemSketch or null
+   * @return a SingleItemThetaSketch or null
    */
   static SingleItemSketch create(final byte[] data) {
     if ((data == null) || (data.length == 0)) { return null; }
@@ -166,7 +166,7 @@ static SingleItemSketch create(final byte[] data) {
    * method but will be a little faster as it avoids the complexity of the UTF8 encoding.

    *
    * @param data The given char array.
-   * @return a SingleItemSketch or null
+   * @return a SingleItemThetaSketch or null
    */
   static SingleItemSketch create(final char[] data) {
     if ((data == null) || (data.length == 0)) { return null; }
@@ -178,7 +178,7 @@ static SingleItemSketch create(final char[] data) {
    * If the integer array is null or empty no create attempt is made and the method returns null.
    *
    * @param data The given int array.
-   * @return a SingleItemSketch or null
+   * @return a SingleItemThetaSketch or null
    */
   static SingleItemSketch create(final int[] data) {
     if ((data == null) || (data.length == 0)) { return null; }
@@ -190,7 +190,7 @@ static SingleItemSketch create(final int[] data) {
    * If the long array is null or empty no create attempt is made and the method returns null.
    *
    * @param data The given long array.
-   * @return a SingleItemSketch or null
+   * @return a SingleItemThetaSketch or null
    */
   static SingleItemSketch create(final long[] data) {
     if ((data == null) || (data.length == 0)) { return null; }
@@ -204,7 +204,7 @@ static SingleItemSketch create(final long[] data) {
    *
    * @param datum The given long datum.
    * @param seed used to hash the given value.
-   * @return a SingleItemSketch
+   * @return a SingleItemThetaSketch
    */
   static SingleItemSketch create(final long datum, final long seed) {
     final long[] data = { datum };
@@ -220,7 +220,7 @@ static SingleItemSketch create(final long datum, final long seed) {
    *
    * @param datum The given double datum.
    * @param seed used to hash the given value.
-   * @return a SingleItemSketch
+   * @return a SingleItemThetaSketch
    */
   static SingleItemSketch create(final double datum, final long seed) {
     final double d = (datum == 0.0) ? 0.0 : datum; // canonicalize -0.0, 0.0
@@ -239,7 +239,7 @@ static SingleItemSketch create(final double datum, final long seed) {
    *
    * @param datum The given String.
    * @param seed used to hash the given value.
-   * @return a SingleItemSketch or null
+   * @return a SingleItemThetaSketch or null
    */
   static SingleItemSketch create(final String datum, final long seed) {
     if ((datum == null) || datum.isEmpty()) { return null; }
@@ -253,7 +253,7 @@ static SingleItemSketch create(final String datum, final long seed) {
    *
    * @param data The given byte array.
    * @param seed used to hash the given value.
-   * @return a SingleItemSketch or null
+   * @return a SingleItemThetaSketch or null
    */
   static SingleItemSketch create(final byte[] data, final long seed) {
     if ((data == null) || (data.length == 0)) { return null; }
@@ -269,7 +269,7 @@ static SingleItemSketch create(final byte[] data, final long seed) {
    *
    * @param data The given char array.
    * @param seed used to hash the given value.
-   * @return a SingleItemSketch or null
+   * @return a SingleItemThetaSketch or null
    */
   static SingleItemSketch create(final char[] data, final long seed) {
     if ((data == null) || (data.length == 0)) { return null; }
@@ -282,7 +282,7 @@ static SingleItemSketch create(final char[] data, final long seed) {
    *
    * @param data The given int array.
    * @param seed used to hash the given value.
-   * @return a SingleItemSketch or null
+   * @return a SingleItemThetaSketch or null
    */
   static SingleItemSketch create(final int[] data, final long seed) {
     if ((data == null) || (data.length == 0)) { return null; }
@@ -295,14 +295,14 @@ static SingleItemSketch create(final int[] data, final long seed) {
    *
    * @param data The given long array.
    * @param seed used to hash the given value.
-   * @return a SingleItemSketch or null
+   * @return a SingleItemThetaSketch or null
    */
   static SingleItemSketch create(final long[] data, final long seed) {
     if ((data == null) || (data.length == 0)) { return null; }
     return new SingleItemSketch(hash(data, seed)[0] >>> 1, seed);
   }
 
-  //Sketch
+  //ThetaSketch
 
   @Override //much faster
   public int getCountLessThanThetaLong(final long thetaLong) {
@@ -330,7 +330,7 @@ public double getLowerBound(final int numStdDev) {
   }
 
   @Override
-  public int getRetainedEntries(final boolean valid) { //valid is only relevant for the Alpha Sketch
+  public int getRetainedEntries(final boolean valid) { //valid is only relevant for the AlphaSketch
     return 1;
   }
 
@@ -399,7 +399,7 @@ static boolean checkForSingleItem(
     // SingleItem flag may not be set due to a historical bug, so we can't depend on it for now.
     // However, if the above flags are correct, preLongs == 1, SerVer >= 3, FamilyID == 3,
     // and the hash seed matches (not done here), it is virtually guaranteed that we have a
-    // SingleItem Sketch.
+    // SingleItemThetaSketch.
     final boolean preLongsOK = preLongs == 1;
     final boolean serVerOK = serVer >= 3;
     final boolean famIdOK = famId == Family.COMPACT.getID();
diff --git a/src/main/java/org/apache/datasketches/theta/ThetaAnotB.java b/src/main/java/org/apache/datasketches/theta/ThetaAnotB.java
index fc523115b..afac16dee 100644
--- a/src/main/java/org/apache/datasketches/theta/ThetaAnotB.java
+++ b/src/main/java/org/apache/datasketches/theta/ThetaAnotB.java
@@ -24,30 +24,30 @@
 import org.apache.datasketches.common.Family;
 
 /**
- * Computes a set difference, A-AND-NOT-B, of two theta sketches.
+ * Computes a set difference, A-AND-NOT-B, of two ThetaSketches.
  * This class includes both stateful and stateless operations.
  *
  * 
The stateful operation is as follows:

  * 

- * AnotB anotb = SetOperationBuilder.buildAnotB();
+ * ThetaAnotB anotb = ThetaSetOperationBuilder.buildAnotB();
  *
- * anotb.setA(Sketch skA); //The first argument.
- * anotb.notB(Sketch skB); //The second (subtraction) argument.
- * anotb.notB(Sketch skC); // ...any number of additional subtractions...
+ * anotb.setA(ThetaSketch skA); //The first argument.
+ * anotb.notB(ThetaSketch skB); //The second (subtraction) argument.
+ * anotb.notB(ThetaSketch skC); // ...any number of additional subtractions...
  * anotb.getResult(false); //Get an interim result.
- * anotb.notB(Sketch skD); //Additional subtractions.
- * anotb.getResult(true);  //Final result and resets the AnotB operator.
+ * anotb.notB(ThetaSketch skD); //Additional subtractions.
+ * anotb.getResult(true);  //Final result and resets the ThetaAnotB operator.
  * 

  *
  * 
The stateless operation is as follows:

  * 

- * AnotB anotb = SetOperationBuilder.buildAnotB();
+ * ThetaAnotB anotb = ThetaSetOperationBuilder.buildAnotB();
  *
- * CompactSketch csk = anotb.aNotB(Sketch skA, Sketch skB);
+ * CompactThetaSketch csk = anotb.aNotB(ThetaSketch skA, ThetaSketch skB);
  * 

  *
  * 
Calling the setA operation a second time essentially clears the internal state and loads
- * the new sketch.

+ * the new ThetaSketch.

  *
  * 
The stateless and stateful operations are independent of each other with the exception of
  * sharing the same update hash seed loaded as the default seed or specified by the user as an
@@ -55,12 +55,12 @@
  *
  * @author Lee Rhodes
  */
-public abstract class AnotB extends SetOperation {
+public abstract class ThetaAnotB extends ThetaSetOperation {
 
   /**
    * Constructor
    */
-  AnotB() {}
+  ThetaAnotB() {}
 
   @Override
   public Family getFamily() {
@@ -68,9 +68,9 @@ public Family getFamily() {
   }
 
   /**
-   * This is part of a multistep, stateful AnotB operation and sets the given Theta sketch as the
+   * This is part of a multistep, stateful ThetaAnotB operation and sets the given ThetaSketch as the
    * first argument A of A-AND-NOT-B. This overwrites the internal state of this
-   * AnotB operator with the contents of the given sketch.
+   * ThetaAnotB operator with the contents of the given sketch.
    * This sets the stage for multiple following notB steps.
    *
    * 
An input argument of null will throw an exception.

@@ -95,9 +95,9 @@ public Family getFamily() {
   public abstract void setA(ThetaSketch skA);
 
   /**
-   * This is part of a multistep, stateful AnotB operation and sets the given Theta sketch as the
+   * This is part of a multistep, stateful ThetaAnotB operation and sets the given ThetaSketch as the
    * second (or n+1th) argument B of A-AND-NOT-B.
-   * Performs an AND NOT operation with the existing internal state of this AnotB operator.
+   * Performs an AND NOT operation with the existing internal state of this ThetaAnotB operator.
    *
    * 
An input argument of null or empty is ignored.

    *
@@ -109,28 +109,28 @@ public Family getFamily() {
    *
    * 
Use {@link #getResult(boolean)} to obtain the result.

    *
-   * @param skB The incoming Theta sketch for the second (or following) argument B.
+   * @param skB The incoming ThetaSketch for the second (or following) argument B.
    */
   public abstract void notB(ThetaSketch skB);
 
   /**
-   * Gets the result of the multistep, stateful operation AnotB that have been executed with calls
+   * Gets the result of the multistep, stateful operation ThetaAnotB that have been executed with calls
    * to {@link #setA(ThetaSketch)} and ({@link #notB(ThetaSketch)} or
    * {@link #notB(org.apache.datasketches.theta.ThetaSketch)}).
    *
    * @param reset If true, clears this operator to the empty state after this result is
    * returned. Set this to false if you wish to obtain an intermediate result.
    *
-   * @return the result of this operation as an ordered, on-heap {@link CompactSketch}.
+   * @return the result of this operation as an ordered, on-heap {@link CompactThetaSketch}.
    */
-  public abstract CompactSketch getResult(boolean reset);
+  public abstract CompactThetaSketch getResult(boolean reset);
 
   /**
-   * Gets the result of the multistep, stateful operation AnotB that have been executed with calls
+   * Gets the result of the multistep, stateful operation ThetaAnotB that have been executed with calls
    * to {@link #setA(ThetaSketch)} and ({@link #notB(ThetaSketch)} or
    * {@link #notB(org.apache.datasketches.theta.ThetaSketch)}).
    *
-   * @param dstOrdered If true, the result will be an ordered {@link CompactSketch}.
+   * @param dstOrdered If true, the result will be an ordered {@link CompactThetaSketch}.
    * See Destination Ordered.
    *
    * @param dstSeg if not null the given MemorySegment will be the target location of the result.
@@ -138,13 +138,13 @@ public Family getFamily() {
    * @param reset If true, clears this operator to the empty state after this result is
    * returned. Set this to false if you wish to obtain an intermediate result.
    *
-   * @return the result of this operation as a {@link CompactSketch} in the given dstSeg.
+   * @return the result of this operation as a {@link CompactThetaSketch} in the given dstSeg.
    */
-  public abstract CompactSketch getResult(boolean dstOrdered, MemorySegment dstSeg, boolean reset);
+  public abstract CompactThetaSketch getResult(boolean dstOrdered, MemorySegment dstSeg, boolean reset);
 
   /**
    * Perform A-and-not-B set operation on the two given sketches and return the result as an
-   * ordered CompactSketch on the heap.
+   * ordered CompactThetaSketch on the heap.
    *
    * 
This a stateless operation and has no impact on the internal state of this operator.
    * Thus, this is not an accumulating update and does not interact with the {@link #setA(ThetaSketch)},
@@ -164,15 +164,15 @@ public Family getFamily() {
    *
    * @param skA The incoming sketch for the first argument. It must not be null.
    * @param skB The incoming sketch for the second argument. It must not be null.
-   * @return an ordered CompactSketch on the heap
+   * @return an ordered CompactThetaSketch on the heap
    */
-  public CompactSketch aNotB(final ThetaSketch skA, final ThetaSketch skB) {
+  public CompactThetaSketch aNotB(final ThetaSketch skA, final ThetaSketch skB) {
     return aNotB(skA, skB, true, null);
   }
 
   /**
    * Perform A-and-not-B set operation on the two given sketches and return the result as a
-   * CompactSketch.
+   * CompactThetaSketch.
    *
    * 
This a stateless operation and has no impact on the internal state of this operator.
    * Thus, this is not an accumulating update and does not interact with the {@link #setA(ThetaSketch)},
@@ -195,9 +195,9 @@ public CompactSketch aNotB(final ThetaSketch skA, final ThetaSketch skB) {
    * @param dstOrdered
    * See Destination Ordered.
    * @param dstSeg the destination MemorySegment
-   * @return the result as a CompactSketch.
+   * @return the result as a CompactThetaSketch.
    */
-  public abstract CompactSketch aNotB(ThetaSketch skA, ThetaSketch skB, boolean dstOrdered,
+  public abstract CompactThetaSketch aNotB(ThetaSketch skA, ThetaSketch skB, boolean dstOrdered,
       MemorySegment dstSeg);
 
 }
diff --git a/src/main/java/org/apache/datasketches/theta/ThetaAnotBimpl.java b/src/main/java/org/apache/datasketches/theta/ThetaAnotBimpl.java
index dc9ecb657..5fcefdad0 100644
--- a/src/main/java/org/apache/datasketches/theta/ThetaAnotBimpl.java
+++ b/src/main/java/org/apache/datasketches/theta/ThetaAnotBimpl.java
@@ -38,7 +38,7 @@
  * @author Lee Rhodes
  * @author Kevin Lang
  */
-final class AnotBimpl extends AnotB {
+final class ThetaAnotBimpl extends ThetaAnotB {
   private final short seedHash_;
   private boolean empty_;
   private long thetaLong_;
@@ -46,20 +46,20 @@ final class AnotBimpl extends AnotB {
   private int curCount_;
 
   /**
-   * Construct a new AnotB SetOperation on the java heap.  Called by SetOperation.Builder.
+   * Construct a new ThetaAnotB on the java heap.  Called by ThetaSetOperationBuilder.
    *
    * @param seed See seed
    */
-  AnotBimpl(final long seed) {
+  ThetaAnotBimpl(final long seed) {
     this(Util.computeSeedHash(seed));
   }
 
   /**
-   * Construct a new AnotB SetOperation on the java heap.
+   * Construct a new ThetaAnotB on the java heap.
    *
    * @param seedHash 16 bit hash of the chosen update seed.
    */
-  private AnotBimpl(final short seedHash) {
+  private ThetaAnotBimpl(final short seedHash) {
     seedHash_ = seedHash;
     reset();
   }
@@ -99,21 +99,21 @@ public void notB(final ThetaSketch skB) {
   }
 
   @Override
-  public CompactSketch getResult(final boolean reset) {
+  public CompactThetaSketch getResult(final boolean reset) {
     return getResult(true, null, reset);
   }
 
   @Override
-  public CompactSketch getResult(final boolean dstOrdered, final MemorySegment dstSeg,
+  public CompactThetaSketch getResult(final boolean dstOrdered, final MemorySegment dstSeg,
       final boolean reset) {
-    final CompactSketch result = CompactOperations.componentsToCompact(
+    final CompactThetaSketch result = CompactOperations.componentsToCompact(
       thetaLong_, curCount_, seedHash_, empty_, true, false, dstOrdered, dstSeg, hashArr_.clone());
     if (reset) { reset(); }
     return result;
   }
 
   @Override
-  public CompactSketch aNotB(final ThetaSketch skA, final ThetaSketch skB, final boolean dstOrdered,
+  public CompactThetaSketch aNotB(final ThetaSketch skA, final ThetaSketch skB, final boolean dstOrdered,
       final MemorySegment dstSeg) {
     if ((skA == null) || (skB == null)) {
       throw new SketchesArgumentException("Neither argument may be null");
@@ -154,7 +154,7 @@ int getRetainedEntries() {
 
   private static long[] getHashArrA(final ThetaSketch skA) { //returns a new array
     //Get skA cache as array
-    final CompactSketch cskA = skA.compact(false, null); //sorting not required
+    final CompactThetaSketch cskA = skA.compact(false, null); //sorting not required
     return cskA.getCache().clone();
   }
 
@@ -166,7 +166,7 @@ private static long[] getResultHashArr( //returns a new array
 
     // Rebuild or get hashtable of skB
     final long[] hashTableB; //read only
-    if (skB instanceof CompactSketch) {
+    if (skB instanceof CompactThetaSketch) {
       hashTableB = convertToHashTable(skB, minThetaLong, ThetaUtil.REBUILD_THRESHOLD);
     } else {
       hashTableB = skB.getCache();
diff --git a/src/main/java/org/apache/datasketches/theta/ThetaIntersection.java b/src/main/java/org/apache/datasketches/theta/ThetaIntersection.java
index 4482df91c..a1d0809cd 100644
--- a/src/main/java/org/apache/datasketches/theta/ThetaIntersection.java
+++ b/src/main/java/org/apache/datasketches/theta/ThetaIntersection.java
@@ -33,7 +33,7 @@
  *
  * @author Lee Rhodes
  */
-public abstract class Intersection extends SetOperation {
+public abstract class ThetaIntersection extends ThetaSetOperation {
 
   @Override
   public Family getFamily() {
@@ -41,22 +41,22 @@ public Family getFamily() {
   }
 
   /**
-   * Gets the result of this operation as an ordered CompactSketch on the Java heap.
+   * Gets the result of this operation as an ordered CompactThetaSketch on the Java heap.
    * This does not disturb the underlying data structure of this intersection.
    * The {@link #intersect(ThetaSketch)} method must have been called at least once, otherwise an
-   * exception will be thrown. This is because a virgin Intersection object represents the
+   * exception will be thrown. This is because a virgin intersection represents the
    * Universal Set, which has an infinite number of values.
-   * @return the result of this operation as an ordered CompactSketch on the Java heap
+   * @return the result of this operation as an ordered CompactThetaSketch on the Java heap
    */
-  public CompactSketch getResult() {
+  public CompactThetaSketch getResult() {
     return getResult(true, null);
   }
 
   /**
-   * Gets the result of this operation as a CompactSketch in the given dstSeg.
+   * Gets the result of this operation as a CompactThetaSketch in the given dstSeg.
    * This does not disturb the underlying data structure of this intersection.
    * The {@link #intersect(ThetaSketch)} method must have been called at least once, otherwise an
-   * exception will be thrown. This is because a virgin Intersection object represents the
+   * exception will be thrown. This is because a virgin intersection represents the
    * Universal Set, which has an infinite number of values.
    *
    * 
Note that presenting an intersection with an empty sketch sets the internal
@@ -71,10 +71,10 @@ public CompactSketch getResult() {
    *
    * @param dstSeg the destination MemorySegment.
    *
-   * @return the result of this operation as a CompactSketch stored in the given dstSeg,
+   * @return the result of this operation as a CompactThetaSketch stored in the given dstSeg,
    * which can be either on or off-heap..
    */
-  public abstract CompactSketch getResult(boolean dstOrdered, MemorySegment dstSeg);
+  public abstract CompactThetaSketch getResult(boolean dstOrdered, MemorySegment dstSeg);
 
   /**
    * Returns true if there is a valid intersection result available
@@ -83,7 +83,7 @@ public CompactSketch getResult() {
   public abstract boolean hasResult();
 
   /**
-   * Resets this Intersection for stateful operations only.
+   * Resets this ThetaIntersection for stateful operations only.
    * The seed remains intact, otherwise reverts to
    * the Universal Set: theta = 1.0, no retained data and empty = false.
    */
@@ -106,52 +106,52 @@ public CompactSketch getResult() {
 
   /**
    * Perform intersect set operation on the two given sketch arguments and return the result as an
-   * ordered CompactSketch on the heap.
+   * ordered CompactThetaSketch on the heap.
    * @param a The first sketch argument
    * @param b The second sketch argument
-   * @return an ordered CompactSketch on the heap
+   * @return an ordered CompactThetaSketch on the heap
    */
-  public CompactSketch intersect(final ThetaSketch a, final ThetaSketch b) {
+  public CompactThetaSketch intersect(final ThetaSketch a, final ThetaSketch b) {
     return intersect(a, b, true, null);
   }
 
   /**
    * Perform intersect set operation on the two given sketches and return the result as a
-   * CompactSketch.
+   * CompactThetaSketch.
    * @param a The first sketch argument
    * @param b The second sketch argument
    * @param dstOrdered
    * See Destination Ordered.
    * @param dstSeg the destination MemorySegment.
-   * @return the result as a CompactSketch.
+   * @return the result as a CompactThetaSketch.
    */
-  public abstract CompactSketch intersect(ThetaSketch a, ThetaSketch b, boolean dstOrdered,
+  public abstract CompactThetaSketch intersect(ThetaSketch a, ThetaSketch b, boolean dstOrdered,
       MemorySegment dstSeg);
 
   /**
-   * Factory: Wrap an Intersection target around the given source MemorySegment containing intersection data.
+   * Factory: Wrap a ThetaIntersection target around the given source MemorySegment containing intersection data.
    * This method assumes the Default Update Seed.
    * If the given source MemorySegment is read-only, the returned object will also be read-only.
    * @param srcSeg The source MemorySegment image.
-   * @return an Intersection that wraps a source MemorySegment that contains an Intersection image
+   * @return a ThetaIntersection that wraps a source MemorySegment that contains a ThetaIntersection image
    */
-  public static Intersection wrap(final MemorySegment srcSeg) {
+  public static ThetaIntersection wrap(final MemorySegment srcSeg) {
     return wrap(srcSeg, Util.DEFAULT_UPDATE_SEED);
   }
 
   /**
-   * Factory: Wrap an Intersection target around the given source MemorySegment containing intersection data.
+   * Factory: Wrap a ThetaIntersection target around the given source MemorySegment containing intersection data.
    * If the given source MemorySegment is read-only, the returned object will also be read-only.
    * @param srcSeg The source MemorySegment image.
    * @param expectedSeed See seed
-   * @return an Intersection that wraps a source MemorySegment that contains an Intersection image
+   * @return a ThetaIntersection that wraps a source MemorySegment that contains a ThetaIntersection image
    */
-  public static Intersection wrap(final MemorySegment srcSeg, final long expectedSeed) {
+  public static ThetaIntersection wrap(final MemorySegment srcSeg, final long expectedSeed) {
     final int serVer = srcSeg.get(JAVA_BYTE, SER_VER_BYTE);
     if (serVer != 3) {
       throw new SketchesArgumentException("SerVer must be 3: " + serVer);
     }
-    return IntersectionImpl.wrapInstance(srcSeg, expectedSeed, srcSeg.isReadOnly() );
+    return ThetaIntersectionImpl.wrapInstance(srcSeg, expectedSeed, srcSeg.isReadOnly() );
   }
 
 }
diff --git a/src/main/java/org/apache/datasketches/theta/ThetaIntersectionImpl.java b/src/main/java/org/apache/datasketches/theta/ThetaIntersectionImpl.java
index 54a513831..3dfdf4fa1 100644
--- a/src/main/java/org/apache/datasketches/theta/ThetaIntersectionImpl.java
+++ b/src/main/java/org/apache/datasketches/theta/ThetaIntersectionImpl.java
@@ -73,7 +73,7 @@
 import org.apache.datasketches.thetacommon.ThetaUtil;
 
 /**
- * Intersection operation for Theta Sketches.
+ * The intersection operation for ThetaSketches.
  *
  * 
This implementation uses data either on-heap or off-heap in a given MemorySegment
  * that is owned and managed by the caller.
@@ -83,13 +83,13 @@
  * @author Lee Rhodes
  * @author Kevin Lang
  */
-final class IntersectionImpl extends Intersection {
+final class ThetaIntersectionImpl extends ThetaIntersection {
   private final short seedHash_;
   private final boolean readOnly_; //True if this sketch is to be treated as read only
   private final MemorySegment wseg_;
   private final int maxLgArrLongs_; //only used with MemorySegment, not serialized
 
-  //Note: Intersection does not use lgNomLongs or k, per se.
+  //Note: intersection operation does not use lgNomLongs or k, per se.
   private int lgArrLongs_; //current size of hash table
   private int curCount_; //curCount of HT, if < 0 means Universal Set (US) is true
   private long thetaLong_;
@@ -103,14 +103,14 @@ final class IntersectionImpl extends Intersection {
    * @param dstSegFlag The given MemorySegment is a Destination (new offHeap) MemorySegment.
    * @param readOnly True if MemorySegment is to be treated as read only.
    */
-  private IntersectionImpl(final MemorySegment wseg, final long seed, final boolean dstSegFlag,
+  private ThetaIntersectionImpl(final MemorySegment wseg, final long seed, final boolean dstSegFlag,
       final boolean readOnly) {
     readOnly_ = readOnly;
     if (wseg != null) {
       wseg_ = wseg;
       if (dstSegFlag) { //DstSeg: compute & store seedHash, no seedHash checking
-        IntersectionImpl.checkMinSizeMemorySegment(wseg);
-        maxLgArrLongs_ = !readOnly ? IntersectionImpl.getMaxLgArrLongs(wseg) : 0; //Only Off Heap
+        ThetaIntersectionImpl.checkMinSizeMemorySegment(wseg);
+        maxLgArrLongs_ = !readOnly ? ThetaIntersectionImpl.getMaxLgArrLongs(wseg) : 0; //Only Off Heap
         seedHash_ = Util.computeSeedHash(seed);
         wseg_.set(JAVA_SHORT_UNALIGNED, SEED_HASH_SHORT, seedHash_);
       } else { //SrcSeg:gets and stores the seedHash, checks seg_seedHash against the seed
@@ -126,36 +126,36 @@ private IntersectionImpl(final MemorySegment wseg, final long seed, final boolea
   }
 
   /**
-   * Factory: Construct a new Intersection target on the java heap.
-   * Called by SetOperationBuilder, test.
+   * Factory: Construct a new ThetaIntersection target on the java heap.
+   * Called by ThetaSetOperationBuilder, test.
    *
    * @param seed See Seed
    * @return a new IntersectionImpl on the Java heap
    */
-  static IntersectionImpl initNewHeapInstance(final long seed) {
+  static ThetaIntersectionImpl initNewHeapInstance(final long seed) {
     final boolean dstSegFlag = false;
     final boolean readOnly = false;
-    final IntersectionImpl impl = new IntersectionImpl(null, seed, dstSegFlag, readOnly);
+    final ThetaIntersectionImpl impl = new ThetaIntersectionImpl(null, seed, dstSegFlag, readOnly);
     impl.hardReset();
     return impl;
   }
 
   /**
-   * Factory: Construct a new Intersection target direct to the given destination MemorySegment.
-   * Called by SetOperationBuilder, test.
+   * Factory: Construct a new ThetaIntersection target direct to the given destination MemorySegment.
+   * Called by ThetaSetOperationBuilder, test.
    *
    * @param seed See Seed
    * @param dstSeg destination MemorySegment
    * @return a new IntersectionImpl that may be off-heap
    */
-  static IntersectionImpl initNewDirectInstance(final long seed, final MemorySegment dstSeg) {
+  static ThetaIntersectionImpl initNewDirectInstance(final long seed, final MemorySegment dstSeg) {
     //Load Preamble
     //Pre0
     dstSeg.asSlice(0, CONST_PREAMBLE_LONGS << 3).fill((byte)0);
     insertPreLongs(dstSeg, CONST_PREAMBLE_LONGS); //RF not used = 0
     insertSerVer(dstSeg, SER_VER);
     insertFamilyID(dstSeg, Family.INTERSECTION.getID());
-    //lgNomLongs not used by Intersection
+    //lgNomLongs not used by this intersection operation
     //lgArrLongs set by hardReset
     //flags are already 0: reserved = readOnly = compact = ordered = empty = false;
     //seedHash loaded and checked in IntersectionImpl constructor
@@ -168,7 +168,7 @@ static IntersectionImpl initNewDirectInstance(final long seed, final MemorySegme
     //Initialize
     final boolean dstSegFlag = true;
     final boolean readOnly = false;
-    final IntersectionImpl impl = new IntersectionImpl(dstSeg, seed, dstSegFlag, readOnly);
+    final ThetaIntersectionImpl impl = new ThetaIntersectionImpl(dstSeg, seed, dstSegFlag, readOnly);
     impl.hardReset();
     return impl;
   }
@@ -179,11 +179,11 @@ static IntersectionImpl initNewDirectInstance(final long seed, final MemorySegme
    * @param seed See seed
    * @return a IntersectionImpl instance on the Java heap
    */
-  static IntersectionImpl heapifyInstance(final MemorySegment srcSeg, final long seed) {
+  static ThetaIntersectionImpl heapifyInstance(final MemorySegment srcSeg, final long seed) {
     final boolean dstSegFlag = false;
     final boolean readOnly = false;
-    IntersectionImpl.segChecks(srcSeg);
-    final IntersectionImpl impl = new IntersectionImpl(null, seed, dstSegFlag, readOnly);
+    ThetaIntersectionImpl.segChecks(srcSeg);
+    final ThetaIntersectionImpl impl = new ThetaIntersectionImpl(null, seed, dstSegFlag, readOnly);
 
     //Initialize
     impl.lgArrLongs_ = extractLgArrLongs(srcSeg);
@@ -198,20 +198,20 @@ static IntersectionImpl heapifyInstance(final MemorySegment srcSeg, final long s
   }
 
   /**
-   * Factory: Wrap an Intersection target around the given source MemorySegment containing intersection data.
+   * Factory: Wrap a ThetaIntersection target around the given source MemorySegment containing intersection data.
    * If the given source MemorySegment is read-only, the returned object will also be read-only.
    * @param srcSeg The source MemorySegment image.
    * @param seed See seed
    * @param readOnly True if MemorySegment is to be treated as read only
-   * @return a IntersectionImpl that wraps a source MemorySegment that contains an Intersection image
+   * @return a IntersectionImpl that wraps a source MemorySegment that contains a ThetaIntersection image
    */
-  static IntersectionImpl wrapInstance(
+  static ThetaIntersectionImpl wrapInstance(
       final MemorySegment srcSeg,
       final long seed,
       final boolean readOnly) {
     final boolean dstSegFlag = false;
-    IntersectionImpl.segChecks(srcSeg);
-    final IntersectionImpl impl = new IntersectionImpl(srcSeg, seed, dstSegFlag, readOnly);
+    ThetaIntersectionImpl.segChecks(srcSeg);
+    final ThetaIntersectionImpl impl = new ThetaIntersectionImpl(srcSeg, seed, dstSegFlag, readOnly);
     impl.lgArrLongs_ = extractLgArrLongs(srcSeg);
     impl.curCount_ = extractCurCount(srcSeg);
     impl.thetaLong_ = extractThetaLong(srcSeg);
@@ -220,12 +220,12 @@ static IntersectionImpl wrapInstance(
   }
 
   @Override
-  public CompactSketch intersect(final ThetaSketch a, final ThetaSketch b, final boolean dstOrdered, final MemorySegment dstSeg) {
+  public CompactThetaSketch intersect(final ThetaSketch a, final ThetaSketch b, final boolean dstOrdered, final MemorySegment dstSeg) {
     if ((wseg_ != null) && readOnly_) { throw new SketchesReadOnlyException(); }
     hardReset();
     intersect(a);
     intersect(b);
-    final CompactSketch csk = getResult(dstOrdered, dstSeg);
+    final CompactThetaSketch csk = getResult(dstOrdered, dstSeg);
     hardReset();
     return csk;
   }
@@ -233,7 +233,7 @@ public CompactSketch intersect(final ThetaSketch a, final ThetaSketch b, final b
   @Override
   public void intersect(final ThetaSketch sketchIn) {
     if (sketchIn == null) {
-      throw new SketchesArgumentException("Intersection argument must not be null.");
+      throw new SketchesArgumentException("The input argument must not be null.");
     }
     if ((wseg_ != null) && readOnly_) { throw new SketchesReadOnlyException(); }
     if (empty_ || sketchIn.isEmpty()) { //empty rule
@@ -311,7 +311,7 @@ else if ((curCount_ > 0) && (sketchInEntries > 0)) {
   MemorySegment getMemorySegment() { return wseg_; }
 
   @Override
-  public CompactSketch getResult(final boolean dstOrdered, final MemorySegment dstSeg) {
+  public CompactThetaSketch getResult(final boolean dstOrdered, final MemorySegment dstSeg) {
     if (curCount_ < 0) {
       throw new SketchesStateException(
           "Calling getResult() with no intervening intersections would represent the infinite set, "
@@ -336,7 +336,7 @@ public CompactSketch getResult(final boolean dstOrdered, final MemorySegment dst
     } else {
       hashTable = hashTable_;
     }
-    compactCache = IntersectionImpl.compactCachePart(hashTable, lgArrLongs_, curCount_, thetaLong_, dstOrdered);
+    compactCache = ThetaIntersectionImpl.compactCachePart(hashTable, lgArrLongs_, curCount_, thetaLong_, dstOrdered);
     srcCompact = true;
     srcOrdered = dstOrdered;
     return CompactOperations.componentsToCompact(
@@ -504,7 +504,7 @@ private void moveDataToTgt(final long[] arr, final int count) {
         tmpCnt++;
       }
     }
-    assert tmpCnt == count : "Intersection Count Check: got: " + tmpCnt + ", expected: " + count;
+    assert tmpCnt == count : "ThetaIntersection Count Check: got: " + tmpCnt + ", expected: " + count;
   }
 
   private void moveDataToTgt(final ThetaSketch sketch) {
@@ -530,7 +530,7 @@ private void moveDataToTgt(final ThetaSketch sketch) {
         tmpCnt++;
       }
     }
-    assert tmpCnt == count : "Intersection Count Check: got: " + tmpCnt + ", expected: " + count;
+    assert tmpCnt == count : "ThetaIntersection Count Check: got: " + tmpCnt + ", expected: " + count;
   }
 
   private void hardReset() {
@@ -618,7 +618,7 @@ private static int getMaxLgArrLongs(final MemorySegment dstSeg) {
 
   private static void segChecks(final MemorySegment srcSeg) {
     //Get Preamble
-    //Note: Intersection does not use lgNomLongs (or k), per se.
+    //Note: This intersection operation does not use lgNomLongs (or k), per se.
     //seedHash loaded and checked in private constructor
     final int preLongs = ThetaSketch.getPreambleLongs(srcSeg);
     final int serVer = extractSerVer(srcSeg);
diff --git a/src/main/java/org/apache/datasketches/theta/ThetaSetOperation.java b/src/main/java/org/apache/datasketches/theta/ThetaSetOperation.java
index 72e7a4960..4361b794e 100644
--- a/src/main/java/org/apache/datasketches/theta/ThetaSetOperation.java
+++ b/src/main/java/org/apache/datasketches/theta/ThetaSetOperation.java
@@ -37,97 +37,97 @@
  *
  * @author Lee Rhodes
  */
-public abstract class SetOperation implements MemorySegmentStatus {
+public abstract class ThetaSetOperation implements MemorySegmentStatus {
   static final int CONST_PREAMBLE_LONGS = 3;
 
   /**
    * Constructor
    */
-  SetOperation() {}
+  ThetaSetOperation() {}
 
   /**
    * Makes a new builder
    *
    * @return a new builder
    */
-  public static final SetOperationBuilder builder() {
-    return new SetOperationBuilder();
+  public static final ThetaSetOperationBuilder builder() {
+    return new ThetaSetOperationBuilder();
   }
 
   /**
-   * Heapify takes the SetOperations image in MemorySegment and instantiates an on-heap
-   * SetOperation using the
+   * Heapify takes the ThetaSetOperation image in MemorySegment and instantiates an on-heap
+   * ThetaSetOperation using the
    * Default Update Seed.
-   * The resulting SetOperation will not retain any link to the source MemorySegment.
+   * The resulting ThetaSetOperation will not retain any link to the source MemorySegment.
    *
    * 
Note: Only certain set operators during stateful operations can be serialized and thus
    * heapified.

    *
-   * @param srcSeg an image of a SetOperation where the image seed hash matches the default seed hash.
-   * @return a Heap-based SetOperation from the given MemorySegment
+   * @param srcSeg an image of a ThetaSetOperation where the image seed hash matches the default seed hash.
+   * @return a Heap-based ThetaSetOperation from the given MemorySegment
    */
-  public static SetOperation heapify(final MemorySegment srcSeg) {
+  public static ThetaSetOperation heapify(final MemorySegment srcSeg) {
     return heapify(srcSeg, Util.DEFAULT_UPDATE_SEED);
   }
 
   /**
-   * Heapify takes the SetOperation image in MemorySegment and instantiates an on-heap
-   * SetOperation using the given expectedSeed.
-   * The resulting SetOperation will not retain any link to the source MemorySegment.
+   * Heapify takes the ThetaSetOperation image in MemorySegment and instantiates an on-heap
+   * ThetaSetOperation using the given expectedSeed.
+   * The resulting ThetaSetOperation will not retain any link to the source MemorySegment.
    *
    * 
Note: Only certain set operators during stateful operations can be serialized and thus
    * heapified.

    *
-   * @param srcSeg an image of a SetOperation where the hash of the given expectedSeed matches the image seed hash.
+   * @param srcSeg an image of a ThetaSetOperation where the hash of the given expectedSeed matches the image seed hash.
    * @param expectedSeed the seed used to validate the given MemorySegment image.
    * See Update Hash Seed.
-   * @return a Heap-based SetOperation from the given MemorySegment
+   * @return a Heap-based ThetaSetOperation from the given MemorySegment
    */
-  public static SetOperation heapify(final MemorySegment srcSeg, final long expectedSeed) {
+  public static ThetaSetOperation heapify(final MemorySegment srcSeg, final long expectedSeed) {
     final byte famID = srcSeg.get(JAVA_BYTE, FAMILY_BYTE);
     final Family family = idToFamily(famID);
     switch (family) {
       case UNION : {
-        return UnionImpl.heapifyInstance(srcSeg, expectedSeed);
+        return ThetaUnionImpl.heapifyInstance(srcSeg, expectedSeed);
       }
       case INTERSECTION : {
-        return IntersectionImpl.heapifyInstance(srcSeg, expectedSeed);
+        return ThetaIntersectionImpl.heapifyInstance(srcSeg, expectedSeed);
       }
       default: {
-        throw new SketchesArgumentException("SetOperation cannot heapify family: "
+        throw new SketchesArgumentException("ThetaSetOperation cannot heapify family: "
             + family.toString());
       }
     }
   }
 
   /**
-   * Wrap takes the SetOperation image in MemorySegment and refers to it directly.
+   * Wrap takes the ThetaSetOperation image in MemorySegment and refers to it directly.
    * There is no data copying onto the java heap.
    * This method assumes the Default Update Seed.
    * If the given source MemorySegment is read-only, the returned object will also be read-only.
    *
    * 
Note: Only certain set operators during stateful operations can be serialized and thus wrapped.

    *
-   * @param srcSeg an image of a SetOperation where the image seed hash matches the default seed hash.
-   * @return a SetOperation backed by the given MemorySegment
+   * @param srcSeg an image of a ThetaSetOperation where the image seed hash matches the default seed hash.
+   * @return a ThetaSetOperation backed by the given MemorySegment
    */
-  public static SetOperation wrap(final MemorySegment srcSeg) {
+  public static ThetaSetOperation wrap(final MemorySegment srcSeg) {
     return wrap(srcSeg, Util.DEFAULT_UPDATE_SEED);
   }
 
   /**
-   * Wrap takes the SetOperation image in MemorySegment and refers to it directly.
+   * Wrap takes the ThetaSetOperation image in MemorySegment and refers to it directly.
    * There is no data copying onto the java heap.
    * If the given source MemorySegment is read-only, the returned object will also be read-only.
    *
    * 
Note: Only certain set operators during stateful operations can be serialized and thus wrapped.

    *
-   * @param srcSeg an image of a SetOperation where the hash of the given expectedSeed matches the image seed hash.
+   * @param srcSeg an image of a ThetaSetOperation where the hash of the given expectedSeed matches the image seed hash.
    * @param expectedSeed the seed used to validate the given MemorySegment image.
    * See Update Hash Seed.
-   * @return a SetOperation backed by the given MemorySegment
+   * @return a ThetaSetOperation backed by the given MemorySegment
    */
-  public static SetOperation wrap(final MemorySegment srcSeg, final long expectedSeed) {
+  public static ThetaSetOperation wrap(final MemorySegment srcSeg, final long expectedSeed) {
     final byte famID = srcSeg.get(JAVA_BYTE, FAMILY_BYTE);
     final Family family = idToFamily(famID);
     final int serVer = srcSeg.get(JAVA_BYTE, SER_VER_BYTE);
@@ -136,18 +136,18 @@ public static SetOperation wrap(final MemorySegment srcSeg, final long expectedS
     }
     switch (family) {
       case UNION : {
-        return UnionImpl.wrapInstance(srcSeg, expectedSeed);
+        return ThetaUnionImpl.wrapInstance(srcSeg, expectedSeed);
       }
       case INTERSECTION : {
-        return IntersectionImpl.wrapInstance(srcSeg, expectedSeed, srcSeg.isReadOnly() );
+        return ThetaIntersectionImpl.wrapInstance(srcSeg, expectedSeed, srcSeg.isReadOnly() );
       }
       default:
-        throw new SketchesArgumentException("SetOperation cannot wrap family: " + family.toString());
+        throw new SketchesArgumentException("ThetaSetOperation cannot wrap family: " + family.toString());
     }
   }
 
   /**
-   * Returns the maximum required storage bytes given a nomEntries parameter for Union operations
+   * Returns the maximum required storage bytes given a nomEntries parameter for ThetaUnion operations
    * @param nomEntries Nominal Entries
    * This will become the ceiling power of 2 if it is not.
    * @return the maximum required storage bytes given a nomEntries parameter
@@ -158,7 +158,7 @@ public static int getMaxUnionBytes(final int nomEntries) {
   }
 
   /**
-   * Returns the maximum required storage bytes given a nomEntries parameter for Intersection
+   * Returns the maximum required storage bytes given a nomEntries parameter for intersection
    * operations
    * @param nomEntries Nominal Entries
    * This will become the ceiling power of 2 if it is not.
@@ -170,8 +170,8 @@ public static int getMaxIntersectionBytes(final int nomEntries) {
   }
 
   /**
-   * Returns the maximum number of bytes for the returned CompactSketch, given the
-   * value of nomEntries of the first sketch A of AnotB.
+   * Returns the maximum number of bytes for the returned CompactThetaSketch, given the
+   * value of nomEntries of the first sketch A of ThetaAnotB.
    * @param nomEntries this value must be a power of 2.
    * @return the maximum number of bytes.
    */
@@ -181,8 +181,8 @@ public static int getMaxAnotBResultBytes(final int nomEntries) {
   }
 
   /**
-   * Gets the Family of this SetOperation
-   * @return the Family of this SetOperation
+   * Gets the Family of this ThetaSetOperation
+   * @return the Family of this ThetaSetOperation
    */
   public abstract Family getFamily();
 
diff --git a/src/main/java/org/apache/datasketches/theta/ThetaSetOperationBuilder.java b/src/main/java/org/apache/datasketches/theta/ThetaSetOperationBuilder.java
index d4af63681..d56462fd4 100644
--- a/src/main/java/org/apache/datasketches/theta/ThetaSetOperationBuilder.java
+++ b/src/main/java/org/apache/datasketches/theta/ThetaSetOperationBuilder.java
@@ -32,18 +32,18 @@
 import org.apache.datasketches.thetacommon.ThetaUtil;
 
 /**
- * For building a new SetOperation.
+ * For building a new ThetaSetOperation.
  *
  * @author Lee Rhodes
  */
-public final class SetOperationBuilder {
+public final class ThetaSetOperationBuilder {
   private int bLgNomLongs;
   private long bSeed;
   private ResizeFactor bRF;
   private float bP;
 
   /**
-   * Constructor for building a new SetOperation.  The default configuration is
+   * Constructor for building a new ThetaSetOperation.  The default configuration is
    * 
    
    * 
  • Max Nominal Entries (max K):
    *   {@value org.apache.datasketches.thetacommon.ThetaUtil#DEFAULT_NOMINAL_ENTRIES}
    • 
@@ -53,7 +53,7 @@ public final class SetOperationBuilder {
    * 
  • MemorySegment: null
    • 
    * 

    */
-  public SetOperationBuilder() {
+  public ThetaSetOperationBuilder() {
     bLgNomLongs = Integer.numberOfTrailingZeros(ThetaUtil.DEFAULT_NOMINAL_ENTRIES);
     bSeed = Util.DEFAULT_UPDATE_SEED;
     bP = (float) 1.0;
@@ -66,9 +66,9 @@ public SetOperationBuilder() {
    * The minimum value is 16 and the maximum value is 67,108,864, which is 2^26.
    * @param nomEntries Nominal Entries
    * This will become the ceiling power of 2 if it is not a power of 2.
-   * @return this SetOperationBuilder
+   * @return this ThetaSetOperationBuilder
    */
-  public SetOperationBuilder setNominalEntries(final int nomEntries) {
+  public ThetaSetOperationBuilder setNominalEntries(final int nomEntries) {
     bLgNomLongs = Integer.numberOfTrailingZeros(ceilingPowerOf2(nomEntries));
     if ((bLgNomLongs > ThetaUtil.MAX_LG_NOM_LONGS) || (bLgNomLongs < ThetaUtil.MIN_LG_NOM_LONGS)) {
       throw new SketchesArgumentException("Nominal Entries must be >= 16 and <= 67108864: "
@@ -84,9 +84,9 @@ public SetOperationBuilder setNominalEntries(final int nomEntries) {
    * thoroughly characterized for performance.
    *
    * @param lgNomEntries the log_base2 Nominal Entries.
-   * @return this SetOperationBuilder
+   * @return this ThetaSetOperationBuilder
    */
-  public SetOperationBuilder setLogNominalEntries(final int lgNomEntries) {
+  public ThetaSetOperationBuilder setLogNominalEntries(final int lgNomEntries) {
     bLgNomLongs = ThetaUtil.checkNomLongs(1 << lgNomEntries);
     return this;
   }
@@ -102,9 +102,9 @@ public int getLgNominalEntries() {
   /**
    * Sets the long seed value that is require by the hashing function.
    * @param seed See seed
-   * @return this SetOperationBuilder
+   * @return this ThetaSetOperationBuilder
    */
-  public SetOperationBuilder setSeed(final long seed) {
+  public ThetaSetOperationBuilder setSeed(final long seed) {
     bSeed = seed;
     return this;
   }
@@ -119,12 +119,12 @@ public long getSeed() {
 
   /**
    * Sets the upfront uniform sampling probability, p. Although this functionality is
-   * implemented for Unions only, it rarely makes sense to use it. The proper use of upfront
+   * implemented for ThetaUnions only, it rarely makes sense to use it. The proper use of upfront
    * sampling is when building the sketches.
    * @param p See Sampling Probability, p
-   * @return this SetOperationBuilder
+   * @return this ThetaSetOperationBuilder
    */
-  public SetOperationBuilder setP(final float p) {
+  public ThetaSetOperationBuilder setP(final float p) {
     if ((p <= 0.0) || (p > 1.0)) {
       throw new SketchesArgumentException("p must be > 0 and <= 1.0: " + p);
     }
@@ -143,9 +143,9 @@ public float getP() {
   /**
    * Sets the cache Resize Factor
    * @param rf See Resize Factor
-   * @return this SetOperationBuilder
+   * @return this ThetaSetOperationBuilder
    */
-  public SetOperationBuilder setResizeFactor(final ResizeFactor rf) {
+  public ThetaSetOperationBuilder setResizeFactor(final ResizeFactor rf) {
     bRF = rf;
     return this;
   }
@@ -159,106 +159,106 @@ public ResizeFactor getResizeFactor() {
   }
 
   /**
-   * Returns a SetOperation with the current configuration of this Builder and the given Family.
-   * @param family the chosen SetOperation family
-   * @return a SetOperation
+   * Returns a ThetaSetOperation with the current configuration of this Builder and the given Family.
+   * @param family the chosen ThetaSetOperation family
+   * @return a ThetaSetOperation
    */
-  public SetOperation build(final Family family) {
+  public ThetaSetOperation build(final Family family) {
     return build(family, null);
   }
 
   /**
-   * Returns a SetOperation with the current configuration of this Builder, the given Family
-   * and the given destination MemorySegment. Note that the destination MemorySegment cannot be used with AnotB.
-   * @param family the chosen SetOperation family
+   * Returns a ThetaSetOperation with the current configuration of this Builder, the given Family
+   * and the given destination MemorySegment. Note that the destination MemorySegment cannot be used with ThetaAnotB.
+   * @param family the chosen ThetaSetOperation family
    * @param dstSeg The destination MemorySegment.
-   * @return a SetOperation
+   * @return a ThetaSetOperation
    */
-  public SetOperation build(final Family family, final MemorySegment dstSeg) {
-    SetOperation setOp = null;
+  public ThetaSetOperation build(final Family family, final MemorySegment dstSeg) {
+    ThetaSetOperation setOp = null;
     switch (family) {
       case UNION: {
         if (dstSeg == null) {
-          setOp = UnionImpl.initNewHeapInstance(bLgNomLongs, bSeed, bP, bRF);
+          setOp = ThetaUnionImpl.initNewHeapInstance(bLgNomLongs, bSeed, bP, bRF);
         }
         else {
-          setOp = UnionImpl.initNewDirectInstance(bLgNomLongs, bSeed, bP, bRF, dstSeg);
+          setOp = ThetaUnionImpl.initNewDirectInstance(bLgNomLongs, bSeed, bP, bRF, dstSeg);
         }
         break;
       }
       case INTERSECTION: {
         if (dstSeg == null) {
-          setOp = IntersectionImpl.initNewHeapInstance(bSeed);
+          setOp = ThetaIntersectionImpl.initNewHeapInstance(bSeed);
         }
         else {
-          setOp = IntersectionImpl.initNewDirectInstance(bSeed, dstSeg);
+          setOp = ThetaIntersectionImpl.initNewDirectInstance(bSeed, dstSeg);
         }
         break;
       }
       case A_NOT_B: {
         if (dstSeg == null) {
-          setOp = new AnotBimpl(bSeed);
+          setOp = new ThetaAnotBimpl(bSeed);
         }
         else {
           throw new SketchesArgumentException(
-            "AnotB can not be persisted.");
+            "ThetaAnotB can not be persisted.");
         }
         break;
       }
       default:
         throw new SketchesArgumentException(
-            "Given Family cannot be built as a SetOperation: " + family.toString());
+            "Given Family cannot be built as a ThetaSetOperation: " + family.toString());
     }
     return setOp;
   }
 
   /**
-   * Convenience method, returns a configured SetOperation Union with
+   * Convenience method, returns a configured ThetaSetOperation ThetaUnion with
    * Default Nominal Entries
-   * @return a Union object
+   * @return a ThetaUnion object
    */
-  public Union buildUnion() {
-    return (Union) build(Family.UNION);
+  public ThetaUnion buildUnion() {
+    return (ThetaUnion) build(Family.UNION);
   }
 
   /**
-   * Convenience method, returns a configured SetOperation Union with
+   * Convenience method, returns a configured ThetaSetOperation ThetaUnion with
    * Default Nominal Entries
    * and the given destination MemorySegment.
    * @param dstSeg The destination MemorySegment.
-   * @return a Union object
+   * @return a ThetaUnion object
    */
-  public Union buildUnion(final MemorySegment dstSeg) {
-    return (Union) build(Family.UNION, dstSeg);
+  public ThetaUnion buildUnion(final MemorySegment dstSeg) {
+    return (ThetaUnion) build(Family.UNION, dstSeg);
   }
 
   /**
-   * Convenience method, returns a configured SetOperation Intersection with
+   * Convenience method, returns a configured ThetaIntersection with
    * Default Nominal Entries
-   * @return an Intersection object
+   * @return a ThetaIntersection object
    */
-  public Intersection buildIntersection() {
-    return (Intersection) build(Family.INTERSECTION);
+  public ThetaIntersection buildIntersection() {
+    return (ThetaIntersection) build(Family.INTERSECTION);
   }
 
   /**
-   * Convenience method, returns a configured SetOperation Intersection with
+   * Convenience method, returns a configured ThetaIntersection with
    * Default Nominal Entries
    * and the given destination MemorySegment.
    * @param dstSeg The destination MemorySegment.
-   * @return an Intersection object
+   * @return a ThetaIntersection object
    */
-  public Intersection buildIntersection(final MemorySegment dstSeg) {
-    return (Intersection) build(Family.INTERSECTION, dstSeg);
+  public ThetaIntersection buildIntersection(final MemorySegment dstSeg) {
+    return (ThetaIntersection) build(Family.INTERSECTION, dstSeg);
   }
 
   /**
-   * Convenience method, returns a configured SetOperation ANotB with
+   * Convenience method, returns a configured ThetaSetOperation ANotB with
    * Default Update Seed
-   * @return an ANotB object
+   * @return a ThetaANotB object
    */
-  public AnotB buildANotB() {
-    return (AnotB) build(Family.A_NOT_B);
+  public ThetaAnotB buildANotB() {
+    return (ThetaAnotB) build(Family.A_NOT_B);
   }
 
   @Override
diff --git a/src/main/java/org/apache/datasketches/theta/ThetaSketch.java b/src/main/java/org/apache/datasketches/theta/ThetaSketch.java
index d3a1c2bfd..7ce965084 100644
--- a/src/main/java/org/apache/datasketches/theta/ThetaSketch.java
+++ b/src/main/java/org/apache/datasketches/theta/ThetaSketch.java
@@ -45,7 +45,7 @@
 
 /**
  * The top-level class for all theta sketches. This class is never constructed directly.
- * Use the UpdateSketch.builder() methods to create UpdateSketches.
+ * Use the UpdatableThetaSketch.builder() methods to create UpdatableThetaSketches.
  *
  * @author Lee Rhodes
  */
@@ -56,41 +56,41 @@ public abstract class ThetaSketch implements MemorySegmentStatus {
   //public static factory constructor-type methods
 
   /**
-   * Heapify takes the sketch image in MemorySegment and instantiates an on-heap Sketch.
+   * Heapify takes the sketch image in MemorySegment and instantiates an on-heap ThetaSketch.
    *
    * 
The resulting sketch will not retain any link to the source MemorySegment.

    *
-   * 
For Update Sketches this method checks if the
+   * 
For UpdatableThetaSketches this method checks if the
    * Default Update Seed

    * was used to create the source MemorySegment image.
    *
-   * @param srcSeg an image of a Sketch.
+   * @param srcSeg an image of a ThetaSketch.
    *
-   * @return a Sketch on the heap.
+   * @return a ThetaSketch on the heap.
    */
   public static ThetaSketch heapify(final MemorySegment srcSeg) {
     return heapify(srcSeg, Util.DEFAULT_UPDATE_SEED);
   }
 
   /**
-   * Heapify takes the sketch image in MemorySegment and instantiates an on-heap Sketch.
+   * Heapify takes the sketch image in MemorySegment and instantiates an on-heap ThetaSketch.
    *
    * 
The resulting sketch will not retain any link to the source MemorySegment.

    *
-   * 
For Update Sketches this method checks if the expectedSeed
+   * 
For UpdatableThetaSketches this method checks if the expectedSeed
    * was used to create the source MemorySegment image.

    *
-   * @param srcSeg an image of a Sketch that was created using the given expectedSeed.
+   * @param srcSeg an image of a ThetaSketch that was created using the given expectedSeed.
    * @param expectedSeed the seed used to validate the given MemorySegment image.
    *  See Update Hash Seed.
    * Compact sketches store a 16-bit hash of the seed, but not the seed itself.
-   * @return a Sketch on the heap.
+   * @return a ThetaSketch on the heap.
    */
   public static ThetaSketch heapify(final MemorySegment srcSeg, final long expectedSeed) {
     checkSegPreambleCap(srcSeg);
     final int familyID = extractFamilyID(srcSeg);
     if (familyID == Family.COMPACT.getID()) {
-      return CompactSketch.heapify(srcSeg, expectedSeed);
+      return CompactThetaSketch.heapify(srcSeg, expectedSeed);
     }
     return heapifyUpdateSketchFromMemorySegment(srcSeg, expectedSeed);
   }
@@ -110,8 +110,8 @@ public static ThetaSketch heapify(final MemorySegment srcSeg, final long expecte
    * Default Update Seed
    * was used to create the source MemorySegment image.

    *
-   * @param srcSeg a MemorySegment with an image of a Sketch.
-   * @return a read-only Sketch backed by the given MemorySegment
+   * @param srcSeg a MemorySegment with an image of a ThetaSketch.
+   * @return a read-only ThetaSketch backed by the given MemorySegment
    */
   public static ThetaSketch wrap(final MemorySegment srcSeg) {
     return wrap(srcSeg, Util.DEFAULT_UPDATE_SEED);
@@ -131,10 +131,10 @@ public static ThetaSketch wrap(final MemorySegment srcSeg) {
    * 
This method checks if the given expectedSeed
    * was used to create the source MemorySegment image.

    *
-   * @param srcSeg a MemorySegment with an image of a Sketch.
+   * @param srcSeg a MemorySegment with an image of a ThetaSketch.
    * @param expectedSeed the seed used to validate the given MemorySegment image.
    * See Update Hash Seed.
-   * @return a read-only Sketch backed by the given MemorySegment.
+   * @return a read-only ThetaSketch backed by the given MemorySegment.
    */
   public static ThetaSketch wrap(final MemorySegment srcSeg, final long expectedSeed) {
     checkSegPreambleCap(srcSeg);
@@ -143,45 +143,45 @@ public static ThetaSketch wrap(final MemorySegment srcSeg, final long expectedSe
       return DirectQuickSelectSketchR.readOnlyWrap(srcSeg, expectedSeed);
     }
     if (familyID == Family.COMPACT.getID()) {
-      return CompactSketch.wrap(srcSeg, expectedSeed);
+      return CompactThetaSketch.wrap(srcSeg, expectedSeed);
     }
     final Family family = Family.idToFamily(familyID);
     throw new SketchesArgumentException(
-        "Cannot wrap family: " + family + " as a Sketch");
+        "Cannot wrap family: " + family + " as a ThetaSketch");
   }
 
-  //Sketch interface
+  //ThetaSketch interface
 
   /**
-   * Converts this sketch to a ordered CompactSketch.
+   * Converts this sketch to a ordered CompactThetaSketch.
    *
    * 
If this.isCompact() == true this method returns this,
    * otherwise, this method is equivalent to
    * {@link #compact(boolean, MemorySegment) compact(true, null)}.
    *
-   * 
A CompactSketch is always immutable.

+   * 
A CompactThetaSketch is always immutable.

    *
-   * @return this sketch as an ordered CompactSketch.
+   * @return this sketch as an ordered CompactThetaSketch.
    */
-  public CompactSketch compact() {
-    return isCompact() ? (CompactSketch)this : compact(true, null);
+  public CompactThetaSketch compact() {
+    return isCompact() ? (CompactThetaSketch)this : compact(true, null);
   }
 
   /**
-   * Convert this sketch to a CompactSketch.
+   * Convert this sketch to a CompactThetaSketch.
    *
-   * 
If this sketch is a type of UpdateSketch, the compacting process converts the hash table
-   * of the UpdateSketch to a simple list of the valid hash values.
+   * 
If this sketch is a type of UpdatableThetaSketch, the compacting process converts the hash table
+   * of the UpdatableThetaketch to a simple list of the valid hash values.
    * Any hash values of zero or equal-to or greater than theta will be discarded.
-   * The number of valid values remaining in the CompactSketch depends on a number of factors,
+   * The number of valid values remaining in the CompactThetaSketch depends on a number of factors,
    * but may be larger or smaller than Nominal Entries (or k).
    * It will never exceed 2k.
    * If it is critical to always limit the size to no more than k,
-   * then rebuild() should be called on the UpdateSketch prior to calling this method.

+   * then rebuild() should be called on the UpdatableThetaSketch prior to calling this method.

    *
-   * 
A CompactSketch is always immutable.

+   * 
A CompactThetaSketch is always immutable.

    *
-   * 
A new CompactSketch object is created:

+   * 
A new CompactThetaSketch object is created:

    * 
  • if dstSeg!= null
    • 
    * 
  • if dstSeg == null and this.hasMemorySegment() == true
    • 
    * 
  • if dstSeg == null and this has more than 1 item and this.isOrdered() == false
@@ -196,12 +196,12 @@ public CompactSketch compact() {
    * @param dstSeg
    * See Destination MemorySegment.
    *
-   * @return this sketch as a CompactSketch.
+   * @return this sketch as a CompactThetaSketch.
    */
-  public abstract CompactSketch compact(final boolean dstOrdered, final MemorySegment dstSeg);
+  public abstract CompactThetaSketch compact(final boolean dstOrdered, final MemorySegment dstSeg);
 
   /**
-   * Returns the number of storage bytes required for this Sketch if its current state were
+   * Returns the number of storage bytes required for this ThetaSketch if its current state were
    * compacted. It this sketch is already in the compact form this is equivalent to
    * calling {@link #getCurrentBytes()}.
    * @return number of compact bytes
@@ -239,7 +239,7 @@ public static double getEstimate(final MemorySegment srcSeg) {
     checkSegPreambleCap(srcSeg);
     final int familyId = extractFamilyID(srcSeg);
     if (!isValidSketchID(familyId)) {
-      throw new SketchesArgumentException("Source MemorySegment not a valid Sketch Family: "
+      throw new SketchesArgumentException("Source MemorySegment is not a valid ThetaSketch Family: "
           + Family.idToFamily(familyId).toString());
     }
     return ThetaSketch.estimate(extractThetaLong(srcSeg), getRetainedEntries(srcSeg));
@@ -266,10 +266,10 @@ public double getLowerBound(final int numStdDev) {
   }
 
   /**
-   * Returns the maximum number of storage bytes required for a CompactSketch with the given
+   * Returns the maximum number of storage bytes required for a CompactThetaSketch with the given
    * number of actual entries.
    * @param numberOfEntries the actual number of retained entries stored in the sketch.
-   * @return the maximum number of storage bytes required for a CompactSketch with the given number
+   * @return the maximum number of storage bytes required for a CompactThetaSketch with the given number
    * of retained entries.
    */
   public static int getMaxCompactSketchBytes(final int numberOfEntries) {
@@ -279,10 +279,10 @@ public static int getMaxCompactSketchBytes(final int numberOfEntries) {
   }
 
   /**
-   * Returns the maximum number of storage bytes required for a CompactSketch given the configured
+   * Returns the maximum number of storage bytes required for a CompactThetaSketch given the configured
    * log_base2 of the number of nominal entries, which is a power of 2.
    * @param lgNomEntries Nominal Entries
-   * @return the maximum number of storage bytes required for a CompactSketch with the given
+   * @return the maximum number of storage bytes required for a CompactThetaSketch with the given
    * lgNomEntries.
    */
   public static int getCompactSketchMaxBytes(final int lgNomEntries) {
@@ -291,11 +291,11 @@ public static int getCompactSketchMaxBytes(final int lgNomEntries) {
   }
 
   /**
-   * Returns the maximum number of storage bytes required for an UpdateSketch with the given
+   * Returns the maximum number of storage bytes required for an UpdatableThetaSketch with the given
    * number of nominal entries (power of 2).
    * @param nomEntries Nominal Entries
    * This will become the ceiling power of 2 if it is not.
-   * @return the maximum number of storage bytes required for a UpdateSketch with the given
+   * @return the maximum number of storage bytes required for a UpdatableThetaSketch with the given
    * nomEntries
    */
   public static int getMaxUpdateSketchBytes(final int nomEntries) {
@@ -304,10 +304,10 @@ public static int getMaxUpdateSketchBytes(final int nomEntries) {
   }
 
   /**
-   * Returns the maximum number of storage bytes required for an UpdateSketch with the given
+   * Returns the maximum number of storage bytes required for an UpdatableThetaSketch with the given
    * log_base2 of the nominal entries.
    * @param lgNomEntries log_base2 of Nominal Entries
-   * @return the maximum number of storage bytes required for a UpdateSketch with the given lgNomEntries
+   * @return the maximum number of storage bytes required for a UpdatableThetaSketch with the given lgNomEntries
    */
   public static int getUpdateSketchMaxBytes(final int lgNomEntries) {
     return (16 << lgNomEntries) + (Family.QUICKSELECT.getMaxPreLongs() << 3);
@@ -315,7 +315,7 @@ public static int getUpdateSketchMaxBytes(final int lgNomEntries) {
 
   /**
    * Returns the number of valid entries that have been retained by the sketch.
-   * For the Alpha Sketch this returns only valid entries.
+   * For the AlphaSketch this returns only valid entries.
    * @return the number of valid retained entries.
    */
   public int getRetainedEntries() {
@@ -324,7 +324,7 @@ public int getRetainedEntries() {
 
   /**
    * Returns the number of entries that have been retained by the sketch.
-   * @param valid This parameter is only relevant for the Alpha Sketch.
+   * @param valid This parameter is only relevant for the AlphaSketch.
    * if true, returns the number of valid entries, which are less than theta and used
    * for estimation. Otherwise, return the number of all entries, valid or not, that are currently in the
    * internal sketch cache.
@@ -334,7 +334,7 @@ public int getRetainedEntries() {
 
   /**
    * Returns the number of valid entries that have been retained by the sketch from the given MemorySegment
-   * @param srcSeg the given MemorySegment that has an image of a Sketch
+   * @param srcSeg the given MemorySegment that has an image of a ThetaSketch
    * @return the number of valid retained entries
    */
   public static int getRetainedEntries(final MemorySegment srcSeg) {
@@ -425,7 +425,7 @@ public boolean isEstimationMode() {
   /**
    * Returns a human readable summary of the sketch.  This method is equivalent to the parameterized
    * call:
    
-   * Sketch.toString(sketch, true, false, 8, true);
+   * ThetaSketch.toString(ThetaSketch, true, false, 8, true);
    * @return summary
    */
   @Override
@@ -455,13 +455,13 @@ public String toString(
     int arrLongs = 0;
     float p = 0;
     int rf = 0;
-    final boolean updateSketch = this instanceof UpdateSketch;
+    final boolean updateSketch = this instanceof UpdatableThetaSketch;
 
     final long thetaLong = getThetaLong();
     final int curCount = this.getRetainedEntries(true);
 
     if (updateSketch) {
-      final UpdateSketch uis = (UpdateSketch)this;
+      final UpdatableThetaSketch uis = (UpdatableThetaSketch)this;
       nomLongs = 1 << uis.getLgNomLongs();
       arrLongs = 1 << uis.getLgArrLongs();
       p = uis.getP();
@@ -528,18 +528,18 @@ public String toString(
   }
 
   /**
-   * Returns a human readable string of the preamble of a byte array image of a Theta Sketch.
+   * Returns a human readable string of the preamble of a byte array image of a ThetaSketch.
    * @param byteArr the given byte array
-   * @return a human readable string of the preamble of a byte array image of a Theta Sketch.
+   * @return a human readable string of the preamble of a byte array image of a ThetaSketch.
    */
   public static String toString(final byte[] byteArr) {
     return PreambleUtil.preambleToString(byteArr);
   }
 
   /**
-   * Returns a human readable string of the preamble of a MemorySegment image of a Theta Sketch.
+   * Returns a human readable string of the preamble of a MemorySegment image of a ThetaSketch.
    * @param seg the given MemorySegment object
-   * @return a human readable string of the preamble of a MemorySegment image of a Theta Sketch.
+   * @return a human readable string of the preamble of a MemorySegment image of a ThetaSketch.
    */
   public static String toString(final MemorySegment seg) {
     return PreambleUtil.preambleToString(seg);
@@ -623,7 +623,7 @@ static final double estimate(final long thetaLong, final int curCount) {
   }
 
   /**
-   * Gets the approximate lower error bound from a valid MemorySegment image of a Sketch
+   * Gets the approximate lower error bound from a valid MemorySegment image of a ThetaSketch
    * given the specified number of Standard Deviations.
    * This will return getEstimate() if isEmpty() is true.
    *
@@ -642,7 +642,7 @@ static final double lowerBound(final int curCount, final long thetaLong, final i
   }
 
   /**
-   * Gets the approximate upper error bound from a valid MemorySegment image of a Sketch
+   * Gets the approximate upper error bound from a valid MemorySegment image of a ThetaSketch
    * given the specified number of Standard Deviations.
    * This will return getEstimate() if isEmpty() is true.
    *
@@ -662,11 +662,11 @@ static final double upperBound(final int curCount, final long thetaLong, final i
   }
 
   /**
-   * Instantiates a Heap Update Sketch from MemorySegment.
+   * Instantiates a Heap UpdatableThetaSketch from MemorySegment.
    * @param srcSeg the source MemorySegment
    * @param expectedSeed the seed used to validate the given MemorySegment image.
    * See Update Hash Seed.
-   * @return a Sketch
+   * @return a ThetaSketch
    */
   private static final ThetaSketch heapifyUpdateSketchFromMemorySegment(final MemorySegment srcSeg, final long expectedSeed) {
     final Family family = idToFamily(extractFamilyID(srcSeg));
@@ -684,7 +684,7 @@ private static final ThetaSketch heapifyUpdateSketchFromMemorySegment(final Memo
       return HeapQuickSelectSketch.heapifyInstance(srcSeg, expectedSeed);
     }
     throw new SketchesArgumentException(
-        "Sketch cannot heapify family: " + family + " as a Sketch");
+        "Cannot heapify family: " + family + " as a ThetaSketch");
   }
 
 }
diff --git a/src/main/java/org/apache/datasketches/theta/ThetaUnion.java b/src/main/java/org/apache/datasketches/theta/ThetaUnion.java
index 25b00a7f7..72da65053 100644
--- a/src/main/java/org/apache/datasketches/theta/ThetaUnion.java
+++ b/src/main/java/org/apache/datasketches/theta/ThetaUnion.java
@@ -35,62 +35,62 @@
  *
  * @author Lee Rhodes
  */
-public abstract class Union extends SetOperation {
+public abstract class ThetaUnion extends ThetaSetOperation {
 
   /**
-   * Wrap a Union object around a Union MemorySegment object containing data.
+   * Wrap a ThetaUnion object around a ThetaUnion MemorySegment object containing data.
    * This method assumes the Default Update Seed.
    * This does NO validity checking of the given MemorySegment.
-   * If the given source MemorySegment is read-only, the returned Union object will also be read-only.
+   * If the given source MemorySegment is read-only, the returned ThetaUnion object will also be read-only.
    * @param srcSeg The source MemorySegment object.
    * @return this class
    */
-  public static Union fastWrap(final MemorySegment srcSeg) {
+  public static ThetaUnion fastWrap(final MemorySegment srcSeg) {
     return fastWrap(srcSeg, Util.DEFAULT_UPDATE_SEED);
   }
 
   /**
-   * Wrap a Union object around a Union MemorySegment object containing data.
+   * Wrap a ThetaUnion object around a ThetaUnion MemorySegment object containing data.
    * This does NO validity checking of the given MemorySegment.
-   * If the given source MemorySegment is read-only, the returned Union object will also be read-only.
+   * If the given source MemorySegment is read-only, the returned ThetaUnion object will also be read-only.
    * @param srcSeg The source MemorySegment object.
    * @param expectedSeed the seed used to validate the given MemorySegment image.
    * See seed
    * @return this class
    */
-  public static Union fastWrap(final MemorySegment srcSeg, final long expectedSeed) {
+  public static ThetaUnion fastWrap(final MemorySegment srcSeg, final long expectedSeed) {
     final int serVer = srcSeg.get(JAVA_BYTE, SER_VER_BYTE);
     if (serVer != 3) {
       throw new SketchesArgumentException("SerVer must be 3: " + serVer);
     }
-    return UnionImpl.fastWrapInstance(srcSeg, expectedSeed);
+    return ThetaUnionImpl.fastWrapInstance(srcSeg, expectedSeed);
   }
 
   /**
-   * Wrap a Union object around a Union MemorySegment object containing data.
+   * Wrap a ThetaUnion object around a ThetaUnion MemorySegment object containing data.
    * This method assumes the Default Update Seed.
-   * If the given source MemorySegment is read-only, the returned Union object will also be read-only.
+   * If the given source MemorySegment is read-only, the returned ThetaUnion object will also be read-only.
    * @param srcSeg The source MemorySegment object.
    * @return this class
    */
-  public static Union wrap(final MemorySegment srcSeg) {
+  public static ThetaUnion wrap(final MemorySegment srcSeg) {
     return wrap(srcSeg, Util.DEFAULT_UPDATE_SEED);
   }
 
   /**
-   * Wrap a Union object around a Union MemorySegment object containing data.
-   * If the given source MemorySegment is read-only, the returned Union object will also be read-only.
+   * Wrap a ThetaUnion object around a ThetaUnion MemorySegment object containing data.
+   * If the given source MemorySegment is read-only, the returned ThetaUnion object will also be read-only.
    * @param srcSeg The source MemorySegment object.
    * @param expectedSeed the seed used to validate the given MemorySegment image.
    * See seed
    * @return this class
    */
-  public static Union wrap(final MemorySegment srcSeg, final long expectedSeed) {
+  public static ThetaUnion wrap(final MemorySegment srcSeg, final long expectedSeed) {
     final int serVer = srcSeg.get(JAVA_BYTE, SER_VER_BYTE);
     if (serVer != 3) {
       throw new SketchesArgumentException("SerVer must be 3: " + serVer);
     }
-    return UnionImpl.wrapInstance(srcSeg, expectedSeed);
+    return ThetaUnionImpl.wrapInstance(srcSeg, expectedSeed);
   }
 
   /**
@@ -112,15 +112,15 @@ public Family getFamily() {
   public abstract int getMaxUnionBytes();
 
   /**
-   * Gets the result of this operation as an ordered CompactSketch on the Java heap.
+   * Gets the result of this operation as an ordered CompactThetaSketch on the Java heap.
    * This does not disturb the underlying data structure of the union.
    * Therefore, it is OK to continue updating the union after this operation.
-   * @return the result of this operation as an ordered CompactSketch on the Java heap
+   * @return the result of this operation as an ordered CompactThetaSketch on the Java heap
    */
-  public abstract CompactSketch getResult();
+  public abstract CompactThetaSketch getResult();
 
   /**
-   * Gets the result of this operation as a CompactSketch of the chosen form.
+   * Gets the result of this operation as a CompactThetaSketch of the chosen form.
    * This does not disturb the underlying data structure of the union.
    * Therefore, it is OK to continue updating the union after this operation.
    *
@@ -129,18 +129,18 @@ public Family getFamily() {
    *
    * @param dstSeg destination MemorySegment
    *
-   * @return the result of this operation as a CompactSketch of the chosen form
+   * @return the result of this operation as a CompactThetaSketch of the chosen form
    */
-  public abstract CompactSketch getResult(boolean dstOrdered, MemorySegment dstSeg);
+  public abstract CompactThetaSketch getResult(boolean dstOrdered, MemorySegment dstSeg);
 
   /**
-   * Resets this Union. The seed remains intact, everything else reverts back to its virgin state.
+   * Resets this ThetaUnion. The seed remains intact, everything else reverts back to its virgin state.
    */
   public abstract void reset();
 
   /**
-   * Returns a byte array image of this Union object
-   * @return a byte array image of this Union object
+   * Returns a byte array image of this ThetaUnion object
+   * @return a byte array image of this ThetaUnion object
    */
   public abstract byte[] toByteArray();
 
@@ -152,30 +152,29 @@ public Family getFamily() {
    *
    * @param sketchA The first argument
    * @param sketchB The second argument
-   * @return the result ordered CompactSketch on the heap.
+   * @return the result ordered CompactThetaSketch on the heap.
    */
-  public CompactSketch union(final ThetaSketch sketchA, final ThetaSketch sketchB) {
+  public CompactThetaSketch union(final ThetaSketch sketchA, final ThetaSketch sketchB) {
     return union(sketchA, sketchB, true, null);
   }
 
   /**
    * This implements a stateless, pair-wise union operation. The returned sketch will be cut back to
-   * k if required, similar to the regular Union operation.
+   * k if required, similar to the regular ThetaUnion operation.
    *
    * 
    Nulls and empty sketches are ignored.
    
    *
    * @param sketchA The first argument
    * @param sketchB The second argument
-   * @param dstOrdered If true, the returned CompactSketch will be ordered.
-   * @param dstSeg If not null, the returned CompactSketch will be placed in this MemorySegment.
-   * @return the result CompactSketch.
+   * @param dstOrdered If true, the returned CompactThetaSketch will be ordered.
+   * @param dstSeg If not null, the returned CompactThetaSketch will be placed in this MemorySegment.
+   * @return the result CompactThetaSketch.
    */
-  public abstract CompactSketch union(ThetaSketch sketchA, ThetaSketch sketchB, boolean dstOrdered,
+  public abstract CompactThetaSketch union(ThetaSketch sketchA, ThetaSketch sketchB, boolean dstOrdered,
       MemorySegment dstSeg);
 
   /**
-   * Perform a Union operation with this union and the given on-heap sketch of the Theta Family.
-   * This method is not valid for the older SetSketch, which was prior to Open Source (August, 2015).
+   * Perform a union operation with this ThetaUnion and the given on-heap sketch of the Theta Family.
    *
    * 
    This method can be repeatedly called.
    *
@@ -186,9 +185,8 @@ public abstract CompactSketch union(ThetaSketch sketchA, ThetaSketch sketchB, bo
   public abstract void union(ThetaSketch sketchIn);
 
   /**
-   * Perform a Union operation with this union and the given MemorySegment image of any sketch of the
-   * Theta Family. The input image may be from earlier versions of the Theta Compact Sketch,
-   * called the SetSketch (circa 2014), which was prior to Open Source and are compact and ordered.
+   * Perform a union operation with this ThetaUnion and the given MemorySegment image of any sketch of the
+   * Theta Family.
    *
    * 
    This method can be repeatedly called.
    *
@@ -225,7 +223,7 @@ public abstract CompactSketch union(ThetaSketch sketchA, ThetaSketch sketchB, bo
    * method and will generally be a little slower depending on the complexity of the UTF8 encoding.
    * 
    
    *
-   * 
    Note: this is not a Sketch Union operation. This treats the given string as a data item.
    
+   * 
    Note: this is not a union operation. This treats the given string as a data item.
    
    *
    * @param datum The given String.
    */
@@ -235,7 +233,7 @@ public abstract CompactSketch union(ThetaSketch sketchA, ThetaSketch sketchB, bo
    * Update this union with the given byte array item.
    * If the byte array is null or empty no update attempt is made and the method returns.
    *
-   * 
    Note: this is not a Sketch Union operation. This treats the given byte array as a data
+   * 
    Note: this is not a union operation. This treats the given byte array as a data
    * item.
    
    *
    * @param data The given byte array.
@@ -246,7 +244,7 @@ public abstract CompactSketch union(ThetaSketch sketchA, ThetaSketch sketchB, bo
    * Update this union with the given ByteBuffer item.
    * If the ByteBuffer is null or empty no update attempt is made and the method returns.
    *
-   * 
    Note: this is not a Sketch Union operation. This treats the given ByteBuffer as a data
+   * 
    Note: this is not a union operation. This treats the given ByteBuffer as a data
    * item.
    
    *
    * @param data The given ByteBuffer.
@@ -257,7 +255,7 @@ public abstract CompactSketch union(ThetaSketch sketchA, ThetaSketch sketchB, bo
    * Update this union with the given integer array item.
    * If the integer array is null or empty no update attempt is made and the method returns.
    *
-   * 
    Note: this is not a Sketch Union operation. This treats the given integer array as a data
+   * 
    Note: this is not a union operation. This treats the given integer array as a data
    * item.
    
    *
    * @param data The given int array.
@@ -271,7 +269,7 @@ public abstract CompactSketch union(ThetaSketch sketchA, ThetaSketch sketchB, bo
    * 
    Note: this will not produce the same output hash values as the {@link #update(String)}
    * method but will be a little faster as it avoids the complexity of the UTF8 encoding.
    
    *
-   * 
    Note: this is not a Sketch Union operation. This treats the given char array as a data
+   * 
    Note: this is not a union operation. This treats the given char array as a data
    * item.
    
    *
    * @param data The given char array.
@@ -282,7 +280,7 @@ public abstract CompactSketch union(ThetaSketch sketchA, ThetaSketch sketchB, bo
    * Update this union with the given long array item.
    * If the long array is null or empty no update attempt is made and the method returns.
    *
-   * 
    Note: this is not a Sketch Union operation. This treats the given char array as a data
+   * 
    Note: this is not a union operation. This treats the given char array as a data
    * item.
    
    *
    * @param data The given long array.
diff --git a/src/main/java/org/apache/datasketches/theta/ThetaUnionImpl.java b/src/main/java/org/apache/datasketches/theta/ThetaUnionImpl.java
index dcc773996..be0ef0014 100644
--- a/src/main/java/org/apache/datasketches/theta/ThetaUnionImpl.java
+++ b/src/main/java/org/apache/datasketches/theta/ThetaUnionImpl.java
@@ -41,35 +41,35 @@
 import org.apache.datasketches.thetacommon.HashOperations;
 
 /**
- * Shared code for the HeapUnion and DirectUnion implementations.
+ * Shared code for the heap union and direct union implementations.
  *
  * @author Lee Rhodes
  * @author Kevin Lang
  */
-final class UnionImpl extends Union {
+final class ThetaUnionImpl extends ThetaUnion {
 
   /**
-   * Although the gadget object is initially an UpdateSketch, in the context of a Union it is used
-   * as a specialized buffer that happens to leverage much of the machinery of an UpdateSketch.
+   * Although the gadget object is initially an UpdatableThetaSketch, in the context of a union it is used
+   * as a specialized buffer that happens to leverage much of the machinery of an UpdatableThetaSketch.
    * However, in this context some of the key invariants of the sketch algorithm are intentionally
-   * violated as an optimization. As a result this object can not be considered as an UpdateSketch
-   * and should never be exported as an UpdateSketch. It's internal state is not necessarily
+   * violated as an optimization. As a result this object can not be considered as an UpdatableThetaSketch
+   * and should never be exported as an UpdatableThetaSketch. It's internal state is not necessarily
    * finalized and may contain garbage. Also its internal concept of "nominal entries" or "k" can
    * be meaningless. It is private for very good reasons.
    */
-  private final UpdateSketch gadget_;
+  private final UpdatableThetaSketch gadget_;
   private final short expectedSeedHash_; //eliminates having to compute the seedHash on every union.
   private long unionThetaLong_; //when on-heap, this is the only copy
   private boolean unionEmpty_;  //when on-heap, this is the only copy
 
-  private UnionImpl(final UpdateSketch gadget, final long seed) {
+  private ThetaUnionImpl(final UpdatableThetaSketch gadget, final long seed) {
     gadget_ = gadget;
     expectedSeedHash_ = Util.computeSeedHash(seed);
   }
 
   /**
-   * Construct a new Union SetOperation on the java heap.
-   * Called by SetOperationBuilder.
+   * Construct a new ThetaUnion on the java heap.
+   * Called by ThetaSetOperationBuilder.
    *
    * @param lgNomLongs See lgNomLongs
    * @param seed See seed
@@ -77,22 +77,22 @@ private UnionImpl(final UpdateSketch gadget, final long seed) {
    * @param rf See Resize Factor
    * @return instance of this sketch
    */
-  static UnionImpl initNewHeapInstance(
+  static ThetaUnionImpl initNewHeapInstance(
       final int lgNomLongs,
       final long seed,
       final float p,
       final ResizeFactor rf) {
-    final UpdateSketch gadget = //create with UNION family
+    final UpdatableThetaSketch gadget = //create with UNION family
         new HeapQuickSelectSketch(lgNomLongs, seed, p, rf, true);
-    final UnionImpl unionImpl = new UnionImpl(gadget, seed);
+    final ThetaUnionImpl unionImpl = new ThetaUnionImpl(gadget, seed);
     unionImpl.unionThetaLong_ = gadget.getThetaLong();
     unionImpl.unionEmpty_ = gadget.isEmpty();
     return unionImpl;
   }
 
   /**
-   * Construct a new Direct Union in the destination MemorySegment.
-   * Called by SetOperationBuilder.
+   * Construct a new direct union in the destination MemorySegment.
+   * Called by ThetaSetOperationBuilder.
    *
    * @param lgNomLongs See lgNomLongs.
    * @param seed See seed
@@ -101,71 +101,71 @@ static UnionImpl initNewHeapInstance(
    * @param dstSeg the given MemorySegment object destination. It will be cleared prior to use.
    * @return this class
    */
-  static UnionImpl initNewDirectInstance(
+  static ThetaUnionImpl initNewDirectInstance(
       final int lgNomLongs,
       final long seed,
       final float p,
       final ResizeFactor rf,
       final MemorySegment dstSeg) {
-    final UpdateSketch gadget = //create with UNION family
+    final UpdatableThetaSketch gadget = //create with UNION family
         new DirectQuickSelectSketch(lgNomLongs, seed, p, rf, dstSeg, null, true);
-    final UnionImpl unionImpl = new UnionImpl(gadget, seed);
+    final ThetaUnionImpl unionImpl = new ThetaUnionImpl(gadget, seed);
     unionImpl.unionThetaLong_ = gadget.getThetaLong();
     unionImpl.unionEmpty_ = gadget.isEmpty();
     return unionImpl;
   }
 
   /**
-   * Heapify a Union from a MemorySegment Union object containing data.
-   * Called by SetOperation.
-   * @param srcSeg The source MemorySegment Union object.
+   * Heapify a ThetaUnion from a MemorySegment object containing data.
+   * Called by ThetaSetOperation.
+   * @param srcSeg The source MemorySegment ThetaUnion object.
    * @param expectedSeed the seed used to validate the given MemorySegment image.
    * See seed
    * @return this class
    */
-  static UnionImpl heapifyInstance(final MemorySegment srcSeg, final long expectedSeed) {
+  static ThetaUnionImpl heapifyInstance(final MemorySegment srcSeg, final long expectedSeed) {
     final MemorySegment srcSegRO = srcSeg.asReadOnly();
     Family.UNION.checkFamilyID(extractFamilyID(srcSegRO));
-    final UpdateSketch gadget = HeapQuickSelectSketch.heapifyInstance(srcSegRO, expectedSeed);
-    final UnionImpl unionImpl = new UnionImpl(gadget, expectedSeed);
+    final UpdatableThetaSketch gadget = HeapQuickSelectSketch.heapifyInstance(srcSegRO, expectedSeed);
+    final ThetaUnionImpl unionImpl = new ThetaUnionImpl(gadget, expectedSeed);
     unionImpl.unionThetaLong_ = extractUnionThetaLong(srcSegRO);
     unionImpl.unionEmpty_ = PreambleUtil.isEmptyFlag(srcSegRO);
     return unionImpl;
   }
 
   /**
-   * Fast-wrap a Union object around a Union MemorySegment object containing data.
+   * Fast-wrap a ThetaUnion object around a MemorySegment object containing data.
    * This does NO validity checking of the given MemorySegment.
    * @param srcSeg The source MemorySegment object.
    * @param expectedSeed the seed used to validate the given MemorySegment image.
    * See seed
    * @return this class
    */
-  static UnionImpl fastWrapInstance(final MemorySegment srcSeg, final long expectedSeed) {
+  static ThetaUnionImpl fastWrapInstance(final MemorySegment srcSeg, final long expectedSeed) {
     Family.UNION.checkFamilyID(extractFamilyID(srcSeg));
-    final UpdateSketch gadget = srcSeg.isReadOnly()
+    final UpdatableThetaSketch gadget = srcSeg.isReadOnly()
         ? DirectQuickSelectSketchR.fastReadOnlyWrap(srcSeg, expectedSeed)
         : DirectQuickSelectSketch.fastWritableWrap(srcSeg, null, expectedSeed);
-    final UnionImpl unionImpl = new UnionImpl(gadget, expectedSeed);
+    final ThetaUnionImpl unionImpl = new ThetaUnionImpl(gadget, expectedSeed);
     unionImpl.unionThetaLong_ = extractUnionThetaLong(srcSeg);
     unionImpl.unionEmpty_ = PreambleUtil.isEmptyFlag(srcSeg);
     return unionImpl;
   }
 
   /**
-   * Wrap a Union object around a Union MemorySegment object containing data.
+   * Wrap a ThetaUnion object around a MemorySegment object containing data.
    * @param srcSeg The source MemorySegment object.
    * @param expectedSeed the seed used to validate the given MemorySegment image.
    * See seed
    * @return this class
    */
-  //Called by SetOperation and Union
-  static UnionImpl wrapInstance(final MemorySegment srcSeg, final long expectedSeed) {
+  //Called by ThetaSetOperation and ThetaUnion
+  static ThetaUnionImpl wrapInstance(final MemorySegment srcSeg, final long expectedSeed) {
     Family.UNION.checkFamilyID(extractFamilyID(srcSeg));
-    final UpdateSketch gadget = srcSeg.isReadOnly()
+    final UpdatableThetaSketch gadget = srcSeg.isReadOnly()
         ? DirectQuickSelectSketchR.readOnlyWrap(srcSeg, expectedSeed)
         : DirectQuickSelectSketch.writableWrap(srcSeg, null, expectedSeed);
-    final UnionImpl unionImpl = new UnionImpl(gadget, expectedSeed);
+    final ThetaUnionImpl unionImpl = new ThetaUnionImpl(gadget, expectedSeed);
     unionImpl.unionThetaLong_ = extractUnionThetaLong(srcSeg);
     unionImpl.unionEmpty_ = PreambleUtil.isEmptyFlag(srcSeg);
     return unionImpl;
@@ -188,12 +188,12 @@ MemorySegment getMemorySegment() {
   }
 
   @Override
-  public CompactSketch getResult() {
+  public CompactThetaSketch getResult() {
     return getResult(true, null);
   }
 
   @Override
-  public CompactSketch getResult(final boolean dstOrdered, final MemorySegment dstSeg) {
+  public CompactThetaSketch getResult(final boolean dstOrdered, final MemorySegment dstSeg) {
     final int gadgetCurCount = gadget_.getRetainedEntries(true);
     final int k = 1 << gadget_.getLgNomLongs();
     final long[] gadgetCacheCopy =
@@ -257,13 +257,13 @@ public byte[] toByteArray() {
     return gadgetByteArr;
   }
 
-  @Override //Stateless Union
-  public CompactSketch union(final ThetaSketch sketchA, final ThetaSketch sketchB, final boolean dstOrdered,
+  @Override //Stateless ThetaUnion
+  public CompactThetaSketch union(final ThetaSketch sketchA, final ThetaSketch sketchB, final boolean dstOrdered,
       final MemorySegment dstSeg) {
     reset();
     union(sketchA);
     union(sketchB);
-    final CompactSketch csk = getResult(dstOrdered, dstSeg);
+    final CompactThetaSketch csk = getResult(dstOrdered, dstSeg);
     reset();
     return csk;
   }
@@ -282,7 +282,7 @@ public void union(final ThetaSketch sketchIn) {
       gadget_.hashUpdate(sketchIn.getCache()[0]);
       return;
     }
-    UnionImpl.checkSketchAndMemorySegmentFlags(sketchIn);
+    ThetaUnionImpl.checkSketchAndMemorySegmentFlags(sketchIn);
 
     unionThetaLong_ = min(min(unionThetaLong_, sketchIn.getThetaLong()), gadget_.getThetaLong()); //Theta rule
     unionEmpty_ = false;
@@ -385,11 +385,11 @@ private static final void checkSketchAndMemorySegmentFlags(final ThetaSketch ske
     final int flags = PreambleUtil.extractFlags(seg);
     if ((flags & COMPACT_FLAG_MASK) > 0 ^ sketch.isCompact()) {
       throw new SketchesArgumentException("Possible corruption: "
-          + "MemorySegment Compact Flag inconsistent with Sketch");
+          + "MemorySegment Compact Flag inconsistent with ThetaSketch Compact Flag");
     }
     if ((flags & ORDERED_FLAG_MASK) > 0 ^ sketch.isOrdered()) {
       throw new SketchesArgumentException("Possible corruption: "
-          + "MemorySegment Ordered Flag inconsistent with Sketch");
+          + "MemorySegment Ordered Flag inconsistent with ThetaSketch Ordered Flag");
     }
   }
 
diff --git a/src/main/java/org/apache/datasketches/theta/UpdatableThetaSketch.java b/src/main/java/org/apache/datasketches/theta/UpdatableThetaSketch.java
index b02e8caf7..a3f511f33 100644
--- a/src/main/java/org/apache/datasketches/theta/UpdatableThetaSketch.java
+++ b/src/main/java/org/apache/datasketches/theta/UpdatableThetaSketch.java
@@ -50,16 +50,16 @@
 import org.apache.datasketches.thetacommon.ThetaUtil;
 
 /**
- * The parent class for the  Update Sketch families, such as QuickSelect and Alpha.
- * The primary task of an Update Sketch is to consider datums presented via the update() methods
+ * The parent class for the  UpdatableThetaSketch families, such as QuickSelectThetaSketch and AlphaSketch.
+ * The primary task of an UpdatableThetaSketch is to consider datums presented via the update() methods
  * for inclusion in its internal cache. This is the sketch building process.
  *
  * @author Lee Rhodes
  */
-public abstract class UpdateSketch extends ThetaSketch {
+public abstract class UpdatableThetaSketch extends ThetaSketch {
   private final long seed_;
 
-  UpdateSketch(final long seed) {
+  UpdatableThetaSketch(final long seed) {
     seed_ = seed; //kept only on heap, never serialized. Hoisted here for performance.
   }
 
@@ -71,12 +71,12 @@ public abstract class UpdateSketch extends ThetaSketch {
   * Default Update Seed.
   * @param srcWSeg an image of a writable sketch where the image seed hash matches the default seed hash.
   * It must have a size of at least 24 bytes.
-  * @return an UpdateSketch backed by the given MemorySegment
+  * @return an UpdatableThetaSketch backed by the given MemorySegment
   * @throws SketchesArgumentException if the provided MemorySegment
   * is invalid, corrupted, or incompatible with this sketch type.
   * Callers must treat this as a fatal error for that segment.
   */
-  public static UpdateSketch wrap(final MemorySegment srcWSeg) {
+  public static UpdatableThetaSketch wrap(final MemorySegment srcWSeg) {
     return wrap(srcWSeg, null, Util.DEFAULT_UPDATE_SEED);
   }
 
@@ -92,12 +92,12 @@ public static UpdateSketch wrap(final MemorySegment srcWSeg) {
   * @param expectedSeed the seed used to validate the given MemorySegment image.
   * See Update Hash Seed.
   * Compact sketches store a 16-bit hash of the seed, but not the seed itself.
-  * @return a UpdateSketch backed by the given MemorySegment
+  * @return a UpdatableThetaSketch backed by the given MemorySegment
   * @throws SketchesArgumentException if the provided MemorySegment
   * is invalid, corrupted, or incompatible with this sketch type.
   * Callers must treat this as a fatal error for that segment.
   */
-  public static UpdateSketch wrap(
+  public static UpdatableThetaSketch wrap(
       final MemorySegment srcWSeg,
       final MemorySegmentRequest mSegReq,
       final long expectedSeed) {
@@ -108,42 +108,42 @@ public static UpdateSketch wrap(
     if (familyID != Family.QUICKSELECT.getID()) {
       final Family family = Family.idToFamily(familyID);
       throw new SketchesArgumentException(
-        "A " + family + " sketch cannot be wrapped as an UpdateSketch.");
+        "A " + family + " sketch cannot be wrapped as an UpdatableThetaSketch.");
     }
     if (serVer == 3 && preLongs == 3) {
       return DirectQuickSelectSketch.writableWrap(srcWSeg, mSegReq, expectedSeed);
     } else {
       throw new SketchesArgumentException(
-        "Corrupted: An UpdateSketch image must have SerVer = 3 and preLongs = 3");
+        "Corrupted: An UpdatableThetaSketch image must have SerVer = 3 and preLongs = 3");
     }
   }
 
   /**
-   * Instantiates an on-heap UpdateSketch from a MemorySegment. This method assumes the
+   * Instantiates an on-heap UpdatableThetaSketch from a MemorySegment. This method assumes the
    * {@link org.apache.datasketches.common.Util#DEFAULT_UPDATE_SEED}.
    * @param srcSeg the given MemorySegment with a sketch image.
    * It must have a size of at least 24 bytes.
-   * @return an UpdateSketch
+   * @return an UpdatableThetaSketch
    * @throws SketchesArgumentException if the provided MemorySegment
    * is invalid, corrupted, or incompatible with this sketch type.
    * Callers must treat this as a fatal error for that segment.
    */
-  public static UpdateSketch heapify(final MemorySegment srcSeg) {
+  public static UpdatableThetaSketch heapify(final MemorySegment srcSeg) {
     return heapify(srcSeg, Util.DEFAULT_UPDATE_SEED);
   }
 
   /**
-   * Instantiates an on-heap UpdateSketch from a MemorySegment.
+   * Instantiates an on-heap UpdatableThetaSketch from a MemorySegment.
    * @param srcSeg the given MemorySegment.
    * It must have a size of at least 24 bytes.
    * @param expectedSeed the seed used to validate the given MemorySegment image.
    * See Update Hash Seed.
-   * @return an UpdateSketch
+   * @return an UpdatableThetaSketch
    * @throws SketchesArgumentException if the provided MemorySegment
    * is invalid, corrupted, or incompatible with this sketch type.
    * Callers must treat this as a fatal error for that segment.
    */
-  public static UpdateSketch heapify(final MemorySegment srcSeg, final long expectedSeed) {
+  public static UpdatableThetaSketch heapify(final MemorySegment srcSeg, final long expectedSeed) {
     Objects.requireNonNull(srcSeg, "Source MemorySegment must not be null");
     checkSegPreambleCap(srcSeg);
     final int familyID = extractFamilyID(srcSeg);
@@ -153,10 +153,10 @@ public static UpdateSketch heapify(final MemorySegment srcSeg, final long expect
     return HeapQuickSelectSketch.heapifyInstance(srcSeg, expectedSeed);
   }
 
-  //Sketch interface
+  //ThetaSketch interface
 
   @Override
-  public CompactSketch compact(final boolean dstOrdered, final MemorySegment dstWSeg) {
+  public CompactThetaSketch compact(final boolean dstOrdered, final MemorySegment dstWSeg) {
     return componentsToCompact(
         getThetaLong(),
         getRetainedEntries(true),
@@ -206,7 +206,7 @@ public boolean isSameResource(final MemorySegment that) {
     return this instanceof final DirectQuickSelectSketchR dqssr && dqssr.isSameResource(that);
   }
 
-  //UpdateSketch interface
+  //UpdatableThetaSketch interface
 
   /**
    * Returns a new builder
@@ -245,7 +245,7 @@ public static final UpdateSketchBuilder builder() {
    * to nominal entries.
    * @return this sketch
    */
-  public abstract UpdateSketch rebuild();
+  public abstract UpdatableThetaSketch rebuild();
 
   /**
    * Present this sketch with a long.
diff --git a/src/main/java/org/apache/datasketches/theta/UpdateReturnState.java b/src/main/java/org/apache/datasketches/theta/UpdateReturnState.java
index a6d5348aa..b929cfb7d 100644
--- a/src/main/java/org/apache/datasketches/theta/UpdateReturnState.java
+++ b/src/main/java/org/apache/datasketches/theta/UpdateReturnState.java
@@ -29,7 +29,7 @@ public enum UpdateReturnState {
   /**
    * The hash was accepted into the sketch and the retained count was incremented.
    */
-  InsertedCountIncremented, //all UpdateSketches
+  InsertedCountIncremented, //all UpdatableThetaSketches
 
   /**
    * The hash was accepted into the sketch, the retained count was incremented.
@@ -63,17 +63,17 @@ public enum UpdateReturnState {
   /**
    * The hash was rejected as a duplicate.
    */
-  RejectedDuplicate, //all UpdateSketches hashUpdate(), enhancedHashInsert
+  RejectedDuplicate, //all UpdatableThetaSketches hashUpdate(), enhancedHashInsert
 
   /**
    * The hash was rejected because it was null or empty.
    */
-  RejectedNullOrEmpty, //UpdateSketch.update(arr[])
+  RejectedNullOrEmpty, //UpdatableThetaSketch.update(arr[])
 
   /**
    * The hash was rejected because the value was negative, zero or
    * greater than theta.
    */
-  RejectedOverTheta; //all UpdateSketches.hashUpdate()
+  RejectedOverTheta; //all UpdatableThetaSketches hashUpdate()
 
 }
diff --git a/src/main/java/org/apache/datasketches/theta/UpdateSketchBuilder.java b/src/main/java/org/apache/datasketches/theta/UpdateSketchBuilder.java
index d91d654b6..e607e6d9d 100644
--- a/src/main/java/org/apache/datasketches/theta/UpdateSketchBuilder.java
+++ b/src/main/java/org/apache/datasketches/theta/UpdateSketchBuilder.java
@@ -35,7 +35,7 @@
 import org.apache.datasketches.thetacommon.ThetaUtil;
 
 /**
- * For building a new UpdateSketch.
+ * For building a new UpdatableThetaSketch.
  *
  * @author Lee Rhodes
  */
@@ -55,7 +55,7 @@ public final class UpdateSketchBuilder {
   private int bMaxNumLocalThreads;
 
   /**
-   * Constructor for building a new UpdateSketch. The default configuration is
+   * Constructor for building a new UpdatableThetaSketch. The default configuration is
    * 
      
    * 
    • Nominal Entries: {@value org.apache.datasketches.thetacommon.ThetaUtil#DEFAULT_NOMINAL_ENTRIES}
      • 
    * 
    • Seed: {@value org.apache.datasketches.common.Util#DEFAULT_UPDATE_SEED}
      • 
@@ -100,7 +100,7 @@ public UpdateSketchBuilder() {
    *
    * @param nomEntries Nominal Entries
    * This will become the ceiling power of 2 if the given value is not.
-   * @return this UpdateSketchBuilder
+   * @return this UpdatableThetaSketchBuilder
    */
   public UpdateSketchBuilder setNominalEntries(final int nomEntries) {
     bLgNomLongs = ThetaUtil.checkNomLongs(nomEntries);
@@ -115,7 +115,7 @@ public UpdateSketchBuilder setNominalEntries(final int nomEntries) {
    * thoroughly characterized for performance.
    *
    * @param lgNomEntries the Log Nominal Entries. Also for the concurrent shared sketch
-   * @return this UpdateSketchBuilder
+   * @return this UpdatableThetaSketchBuilder
    */
   public UpdateSketchBuilder setLogNominalEntries(final int lgNomEntries) {
     bLgNomLongs = ThetaUtil.checkNomLongs(1 << lgNomEntries);
@@ -130,7 +130,7 @@ public UpdateSketchBuilder setLogNominalEntries(final int lgNomEntries) {
    * thoroughly characterized for performance.
    *
    * @param lgK the Log Nominal Entries. Also for the concurrent shared sketch.
-   * @return this UpdateSketchBuilder
+   * @return this UpdatableThetaSketchBuilder
    */
   public UpdateSketchBuilder setLgK(final int lgK) {
     bLgNomLongs = ThetaUtil.checkNomLongs(1 << lgK);
@@ -153,7 +153,7 @@ public int getLgNominalEntries() {
    *
    * @param nomEntries Nominal Entries
    *                   This will become the ceiling power of 2 if it is not.
-   * @return this UpdateSketchBuilder
+   * @return this UpdatableThetaSketchBuilder
    */
   public UpdateSketchBuilder setConCurNominalEntries(final int nomEntries) {
     bConCurLgNomLongs = Integer.numberOfTrailingZeros(ceilingPowerOf2(nomEntries));
@@ -171,7 +171,7 @@ public UpdateSketchBuilder setConCurNominalEntries(final int nomEntries) {
    * value have not been thoroughly tested or characterized for performance.
    *
    * @param lgNomEntries the Log Nominal Entries for a concurrent local sketch
-   * @return this UpdateSketchBuilder
+   * @return this UpdatableThetaSketchBuilder
    */
   public UpdateSketchBuilder setConCurLogNominalEntries(final int lgNomEntries) {
     bConCurLgNomLongs = lgNomEntries;
@@ -193,7 +193,7 @@ public int getConCurLgNominalEntries() {
   /**
    * Sets the local long seed value that is required by the hashing function.
    * @param seed See seed
-   * @return this UpdateSketchBuilder
+   * @return this UpdatableThetaSketchBuilder
    */
   public UpdateSketchBuilder setSeed(final long seed) {
     bSeed = seed;
@@ -211,7 +211,7 @@ public long getSeed() {
   /**
    * Sets the local upfront uniform pre-sampling probability, p
    * @param p See Sampling Probability, p
-   * @return this UpdateSketchBuilder
+   * @return this UpdatableThetaSketchBuilder
    */
   public UpdateSketchBuilder setP(final float p) {
     if (p <= 0.0 || p > 1.0) {
@@ -232,7 +232,7 @@ public float getP() {
   /**
    * Sets the local cache Resize Factor.
    * @param rf See Resize Factor
-   * @return this UpdateSketchBuilder
+   * @return this UpdatableThetaSketchBuilder
    */
   public UpdateSketchBuilder setResizeFactor(final ResizeFactor rf) {
     bRF = rf;
@@ -250,7 +250,7 @@ public ResizeFactor getResizeFactor() {
   /**
    * Set the local Family. Choose either Family.ALPHA or Family.QUICKSELECT.
    * @param family the family for this builder
-   * @return this UpdateSketchBuilder
+   * @return this UpdatableThetaSketchBuilder
    */
   public UpdateSketchBuilder setFamily(final Family family) {
     bFam = family;
@@ -268,7 +268,7 @@ public Family getFamily() {
   /**
    * Sets the local MemorySegmentRequest
    * @param mSegReq the given MemorySegmentRequest
-   * @return this UpdateSketchBuilder
+   * @return this UpdatableThetaSketchBuilder
    */
   public UpdateSketchBuilder setMemorySegmentRequest(final MemorySegmentRequest mSegReq) {
     bMemorySegmentRequest = mSegReq;
@@ -305,7 +305,7 @@ public int getNumPoolThreads() {
    * Sets the local Propagate Ordered Compact flag to the given value. Used with concurrent sketches.
    *
    * @param prop the given value
-   * @return this UpdateSketchBuilder
+   * @return this UpdatableThetaSketchBuilder
    */
   public UpdateSketchBuilder setPropagateOrderedCompact(final boolean prop) {
     bPropagateOrderedCompact = prop;
@@ -356,23 +356,23 @@ public int getMaxNumLocalThreads() {
   // BUILD FUNCTIONS
 
   /**
-   * Returns an UpdateSketch with the current configuration of this Builder.
-   * @return an UpdateSketch
+   * Returns an UpdatableThetaSketch with the current configuration of this Builder.
+   * @return an UpdatableThetaSketch
    */
-  public UpdateSketch build() {
+  public UpdatableThetaSketch build() {
     return build(null);
   }
 
   /**
-   * Returns an UpdateSketch with the current configuration of this Builder
+   * Returns an UpdatableThetaSketch with the current configuration of this Builder
    * with the specified backing destination MemorySegment store.
    * Note: this can only be used with the QUICKSELECT Family of sketches
    * and cannot be used with the Alpha Family of sketches.
    * @param dstSeg The destination MemorySegment.
-   * @return an UpdateSketch
+   * @return an UpdatableThetaSketch
    */
-  public UpdateSketch build(final MemorySegment dstSeg) {
-    UpdateSketch sketch = null;
+  public UpdatableThetaSketch build(final MemorySegment dstSeg) {
+    UpdatableThetaSketch sketch = null;
     final boolean unionGadget = false;
     switch (bFam) {
       case ALPHA: {
@@ -395,14 +395,14 @@ public UpdateSketch build(final MemorySegment dstSeg) {
       }
       default: {
         throw new SketchesArgumentException(
-          "Given Family cannot be built as a Theta Sketch: " + bFam.toString());
+          "Given Family cannot be built as an UpdatableThetaSketch: " + bFam.toString());
       }
     }
     return sketch;
   }
 
   /**
-   * Returns an on-heap concurrent shared UpdateSketch with the current configuration of the
+   * Returns an on-heap concurrent shared UpdatableThetaSketch with the current configuration of the
    * Builder.
    *
    * 
      The parameters unique to the shared concurrent sketch are:
@@ -411,21 +411,21 @@ public UpdateSketch build(final MemorySegment dstSeg) {
    * 
    • Maximum Concurrency Error
      • 
    * 
    
    *
-   * 
    Key parameters that are in common with other Theta sketches:
+   * 
    Key parameters that are in common with other ThetaSketches:
    * 
      
    * 
    • Nominal Entries or Log Nominal Entries (for the shared concurrent sketch)
      • 
    * 
    
    *
-   * @return an on-heap concurrent UpdateSketch with the current configuration of the Builder.
+   * @return an on-heap concurrent UpdatableThetaSketch with the current configuration of the Builder.
    */
-  public UpdateSketch buildShared() {
+  public UpdatableThetaSketch buildShared() {
     return buildShared(null);
   }
 
   /**
-   * Returns a concurrent shared UpdateSketch with the current
+   * Returns a concurrent shared UpdatableThetaSketch with the current
    * configuration of the Builder and the given destination MemorySegment. If the destination
-   * MemorySegment is null, this defaults to an on-heap concurrent shared UpdateSketch.
+   * MemorySegment is null, this defaults to an on-heap concurrent shared UpdatableThetaSketch.
    *
    * 
    The parameters unique to the shared concurrent sketch are:
    * 
      
@@ -440,12 +440,12 @@ public UpdateSketch buildShared() {
    * 
    
    *
    * @param dstSeg the given MemorySegment for Direct, otherwise null.
-   * @return a concurrent UpdateSketch with the current configuration of the Builder
+   * @return a concurrent UpdatableThetaSketch with the current configuration of the Builder
    * and the given destination MemorySegment.
    */
   @SuppressFBWarnings(value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD",
       justification = "Harmless in Builder, fix later")
-  public UpdateSketch buildShared(final MemorySegment dstSeg) {
+  public UpdatableThetaSketch buildShared(final MemorySegment dstSeg) {
     ConcurrentPropagationService.NUM_POOL_THREADS = bNumPoolThreads;
     if (dstSeg == null) {
       return new ConcurrentHeapQuickSelectSketch(bLgNomLongs, bSeed, bMaxConcurrencyError);
@@ -455,10 +455,10 @@ public UpdateSketch buildShared(final MemorySegment dstSeg) {
   }
 
   /**
-   * Returns a direct (potentially off-heap) concurrent shared UpdateSketch with the current
+   * Returns a direct (potentially off-heap) concurrent shared UpdatableThetaSketch with the current
    * configuration of the Builder, the data from the given sketch, and the given destination
    * MemorySegment. If the destination MemorySegment is null, this defaults to an on-heap
-   * concurrent shared UpdateSketch.
+   * concurrent shared UpdatableThetaSketch.
    *
    * 
    The parameters unique to the shared concurrent sketch are:
    * 
      
@@ -472,15 +472,15 @@ public UpdateSketch buildShared(final MemorySegment dstSeg) {
    * 
    • Destination MemorySegment (if not null, returned sketch is Direct. Default is null.)
      • 
    * 
    
    *
-   * @param sketch a given UpdateSketch from which the data is used to initialize the returned
+   * @param sketch a given UpdatableThetaSketch from which the data is used to initialize the returned
    * shared sketch.
    * @param dstSeg the given MemorySegment for Direct, otherwise null.
-   * @return a concurrent UpdateSketch with the current configuration of the Builder
+   * @return a concurrent UpdatableThetaSketch with the current configuration of the Builder
    * and the given destination MemorySegment.
    */
   @SuppressFBWarnings(value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD",
       justification = "Harmless in Builder, fix later")
-  public UpdateSketch buildSharedFromSketch(final UpdateSketch sketch, final MemorySegment dstSeg) {
+  public UpdatableThetaSketch buildSharedFromSketch(final UpdatableThetaSketch sketch, final MemorySegment dstSeg) {
     ConcurrentPropagationService.NUM_POOL_THREADS = bNumPoolThreads;
     if (dstSeg == null) {
       return new ConcurrentHeapQuickSelectSketch(sketch, bSeed, bMaxConcurrencyError);
@@ -490,8 +490,8 @@ public UpdateSketch buildSharedFromSketch(final UpdateSketch sketch, final Memor
   }
 
   /**
-   * Returns a local, on-heap, concurrent UpdateSketch to be used as a per-thread local buffer
-   * along with the given concurrent shared UpdateSketch and the current configuration of this
+   * Returns a local, on-heap, concurrent UpdatableThetaSketch to be used as a per-thread local buffer
+   * along with the given concurrent shared UpdatableThetaSketch and the current configuration of this
    * Builder.
    *
    * 
    The parameters unique to the local concurrent sketch are:
@@ -501,9 +501,9 @@ public UpdateSketch buildSharedFromSketch(final UpdateSketch sketch, final Memor
    * 

    *
    * @param shared the concurrent shared sketch to be accessed via the concurrent local sketch.
-   * @return an UpdateSketch to be used as a per-thread local buffer.
+   * @return an UpdatableThetaSketch to be used as a per-thread local buffer.
    */
-  public UpdateSketch buildLocal(final UpdateSketch shared) {
+  public UpdatableThetaSketch buildLocal(final UpdatableThetaSketch shared) {
     if (shared == null || !(shared instanceof ConcurrentSharedThetaSketch)) {
       throw new SketchesStateException("The concurrent shared sketch must be built first.");
     }
diff --git a/src/main/java/org/apache/datasketches/theta/WrappedCompactCompressedSketch.java b/src/main/java/org/apache/datasketches/theta/WrappedCompactCompressedSketch.java
index 584338469..d709188ed 100644
--- a/src/main/java/org/apache/datasketches/theta/WrappedCompactCompressedSketch.java
+++ b/src/main/java/org/apache/datasketches/theta/WrappedCompactCompressedSketch.java
@@ -44,8 +44,8 @@ final class WrappedCompactCompressedSketch extends WrappedCompactSketch {
   }
 
   /**
-   * Wraps the given bytes, which must be a SerVer 4 compressed CompactSketch image.
-   * @param bytes representation of serialized compressed compact sketch.
+   * Wraps the given bytes, which must be a SerVer 4 compressed CompactThetaSketch image.
+   * @param bytes representation of serialized compressed CompactThetaSketch.
    * @param seedHash The update seedHash.
    * See Seed Hash.
    * @return this sketch
@@ -55,7 +55,7 @@ static WrappedCompactCompressedSketch wrapInstance(final byte[] bytes, final sho
     return new WrappedCompactCompressedSketch(bytes);
   }
 
-  //Sketch Overrides
+  //ThetaSketch Overrides
 
   @Override
   public int getCurrentBytes() {
@@ -69,7 +69,7 @@ public int getCurrentBytes() {
   private static final int START_PACKED_DATA_ESTIMATION_MODE = 16;
 
   @Override
-  public int getRetainedEntries(final boolean valid) { //valid is only relevant for the Alpha Sketch
+  public int getRetainedEntries(final boolean valid) { //valid is only relevant for the AlphaSketch
     // number of entries is stored using variable length encoding
     // most significant bytes with all zeros are not stored
     // one byte in the preamble has the number of non-zero bytes used
diff --git a/src/main/java/org/apache/datasketches/theta/WrappedCompactSketch.java b/src/main/java/org/apache/datasketches/theta/WrappedCompactSketch.java
index 1f3f3ab9e..2a33a386a 100644
--- a/src/main/java/org/apache/datasketches/theta/WrappedCompactSketch.java
+++ b/src/main/java/org/apache/datasketches/theta/WrappedCompactSketch.java
@@ -42,7 +42,7 @@
  *
  * 
This sketch can only be associated with a Serialization Version 3 binary image format.

  */
-class WrappedCompactSketch extends CompactSketch {
+class WrappedCompactSketch extends CompactThetaSketch {
   final byte[] bytes_;
 
   /**
@@ -54,8 +54,8 @@ class WrappedCompactSketch extends CompactSketch {
   }
 
   /**
-   * Wraps the given byteArray, which must be a SerVer 3 CompactSketch image.
-   * @param bytes representation of serialized compressed compact sketch.
+   * Wraps the given byteArray, which must be a SerVer 3 CompactThetaSketch image.
+   * @param bytes representation of serialized CompactThetaSketch.
    * @param seedHash The update seedHash.
    * See Seed Hash.
    * @return this sketch
@@ -65,10 +65,10 @@ static WrappedCompactSketch wrapInstance(final byte[] bytes, final short seedHas
     return new WrappedCompactSketch(bytes);
   }
 
-  //Sketch Overrides
+  //ThetaSketch Overrides
 
   @Override
-  public CompactSketch compact(final boolean dstOrdered, final MemorySegment dstSeg) {
+  public CompactThetaSketch compact(final boolean dstOrdered, final MemorySegment dstSeg) {
     return segmentToCompact(MemorySegment.ofArray(bytes_), dstOrdered, dstSeg);
   }
 
@@ -80,7 +80,7 @@ public int getCurrentBytes() {
   }
 
   @Override
-  public int getRetainedEntries(final boolean valid) { //valid is only relevant for the Alpha Sketch
+  public int getRetainedEntries(final boolean valid) { //valid is only relevant for the AlphaSketch
     final int preLongs = bytes_[PREAMBLE_LONGS_BYTE];
     return (preLongs == 1) ? 0 : getIntLE(bytes_, RETAINED_ENTRIES_INT);
   }
diff --git a/src/main/java/org/apache/datasketches/theta/package-info.java b/src/main/java/org/apache/datasketches/theta/package-info.java
index f203c6a8a..870f4f968 100644
--- a/src/main/java/org/apache/datasketches/theta/package-info.java
+++ b/src/main/java/org/apache/datasketches/theta/package-info.java
@@ -18,10 +18,10 @@
  */
 
 /**
- * The theta package contains the basic sketch classes that are members of the
- * Theta Sketch Framework.
+ * The /theta/ package contains the basic sketch classes that are members of the
+ * ThetaSketch Framework.
  *
- * 
There is a separate Tuple package for many of the sketches that are derived from the
- * same algorithms defined in the Theta Sketch Framework paper.

+ * 
There is a separate /tuple/ package for many of the sketches that are derived from the
+ * same algorithms defined in the ThetaSketch Framework paper.

  */
 package org.apache.datasketches.theta;
diff --git a/src/main/java/org/apache/datasketches/tuple/AnotB.java b/src/main/java/org/apache/datasketches/tuple/AnotB.java
index 75c80a8d8..25b7340fb 100644
--- a/src/main/java/org/apache/datasketches/tuple/AnotB.java
+++ b/src/main/java/org/apache/datasketches/tuple/AnotB.java
@@ -563,7 +563,7 @@ private static  DataArrays getCopyOfResultArraysTheta(
     try { hashCacheB = (long[])GET_CACHE.invoke(skB);
     } catch (final Exception e) { throw new SketchesStateException("Reflection Exception " + e); }
 
-    if (skB instanceof org.apache.datasketches.theta.CompactSketch) {
+    if (skB instanceof org.apache.datasketches.theta.CompactThetaSketch) {
       final int countB = skB.getRetainedEntries(true);
       hashTableB = convertToHashTable(hashCacheB, countB, minThetaLong, ThetaUtil.REBUILD_THRESHOLD);
     } else {
diff --git a/src/main/java/org/apache/datasketches/tuple/Union.java b/src/main/java/org/apache/datasketches/tuple/Union.java
index 9c663f88a..593c944cb 100644
--- a/src/main/java/org/apache/datasketches/tuple/Union.java
+++ b/src/main/java/org/apache/datasketches/tuple/Union.java
@@ -26,8 +26,8 @@
 import org.apache.datasketches.thetacommon.ThetaUtil;
 
 /**
- * Compute the union of two or more generic tuple sketches or generic tuple sketches combined with
- * theta sketches. A new instance represents an empty set.
+ * Compute the union of two or more generic tuple sketches or generic TupleSketches combined with
+ * ThetaSketches. A new instance represents an empty set.
  * @param  Type of Summary
  */
 public class Union {
@@ -77,14 +77,14 @@ public CompactSketch union(final Sketch tupleSketchA, final Sketch tupl
   }
 
   /**
-   * Perform a stateless, pair-wise union operation between a tupleSketch and a thetaSketch.
+   * Perform a stateless, pair-wise union operation between a tupleSketch and a ThetaSketch.
    * The returned sketch will be cut back to the smaller of the two k values if required.
    *
    * 
Nulls and empty sketches are ignored.

    *
    * @param tupleSketch The first argument
    * @param thetaSketch The second argument
-   * @param summary the given proxy summary for the theta sketch, which doesn't have one.
+   * @param summary the given proxy summary for the ThetaSketch, which doesn't have one.
    * This may not be null.
    * @return the result ordered CompactSketch on the heap.
    */
@@ -98,7 +98,7 @@ public CompactSketch union(final Sketch tupleSketch,
   }
 
   /**
-   * Performs a stateful union of the internal set with the given tupleSketch.
+   * Performs a stateful union of the internal set with the given TupleSketch.
    * @param tupleSketch input tuple sketch to merge with the internal set.
    * Nulls and empty sketches are ignored.
    */
@@ -114,10 +114,10 @@ public void union(final Sketch tupleSketch) {
   }
 
   /**
-   * Performs a stateful union of the internal set with the given thetaSketch by combining entries
-   * using the hashes from the theta sketch and summary values from the given summary.
-   * @param thetaSketch the given theta sketch input. If null or empty, it is ignored.
-   * @param summary the given proxy summary for the theta sketch, which doesn't have one. This may
+   * Performs a stateful union of the internal set with the given ThetaSketch by combining entries
+   * using the hashes from the ThetaSketch and summary values from the given summary.
+   * @param thetaSketch the given ThetaSketch input. If null or empty, it is ignored.
+   * @param summary the given proxy summary for the ThetaSketch, which doesn't have one. This may
    * not be null.
    */
   public void union(final org.apache.datasketches.theta.ThetaSketch thetaSketch, final S summary) {
diff --git a/src/test/java/org/apache/datasketches/theta/AnotBimplTest.java b/src/test/java/org/apache/datasketches/theta/AnotBimplTest.java
index 6960fbc32..414308280 100644
--- a/src/test/java/org/apache/datasketches/theta/AnotBimplTest.java
+++ b/src/test/java/org/apache/datasketches/theta/AnotBimplTest.java
@@ -40,8 +40,8 @@ public class AnotBimplTest {
   public void checkExactAnotB_AvalidNoOverlap() {
     final int k = 512;
 
-    final UpdateSketch usk1 = UpdateSketch.builder().setNominalEntries(k).build();
-    final UpdateSketch usk2 = UpdateSketch.builder().setNominalEntries(k).build();
+    final UpdatableThetaSketch usk1 = UpdatableThetaSketch.builder().setNominalEntries(k).build();
+    final UpdatableThetaSketch usk2 = UpdatableThetaSketch.builder().setNominalEntries(k).build();
 
     for (int i=0; i k);
     final boolean useSeg = true;
     final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg);
-    final UpdateSketch shared = sl.shared;
-    final UpdateSketch local = sl.local;
+    final UpdatableThetaSketch shared = sl.shared;
+    final UpdatableThetaSketch local = sl.local;
 
     assertEquals(local.getClass().getSimpleName(), "ConcurrentHeapThetaBuffer");
     assertFalse(local.isOffHeap());
@@ -214,7 +214,7 @@ public void checkDQStoCompactForms() {
     final double localUB  = local.getUpperBound(2);
     assertTrue(local.isEstimationMode());
 
-    CompactSketch csk;
+    CompactThetaSketch csk;
 
     csk = shared.compact(false,  null);
     assertEquals(csk.getEstimate(), localEst);
@@ -261,8 +261,8 @@ public void checkDQStoCompactEmptyForms() {
     final int lgK = 9;
     final boolean useSeg = true;
     final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg);
-    final UpdateSketch shared = sl.shared;
-    final UpdateSketch local = sl.local;
+    final UpdatableThetaSketch shared = sl.shared;
+    final UpdatableThetaSketch local = sl.local;
 
     //empty
     local.toString(false, true, 0, false); //exercise toString
@@ -277,14 +277,14 @@ public void checkDQStoCompactEmptyForms() {
     final byte[] segArr2 = new byte[bytes];
     final MemorySegment seg2 = MemorySegment.ofArray(segArr2);
 
-    final CompactSketch csk2 = shared.compact(false,  seg2);
+    final CompactThetaSketch csk2 = shared.compact(false,  seg2);
     assertEquals(csk2.getEstimate(), localEst);
     assertEquals(csk2.getLowerBound(2), localLB);
     assertEquals(csk2.getUpperBound(2), localUB);
     assertTrue(csk2.isEmpty());
     assertFalse(csk2.isEstimationMode());
     assertTrue(csk2.isOrdered());
-    final CompactSketch csk3 = shared.compact(true, seg2);
+    final CompactThetaSketch csk3 = shared.compact(true, seg2);
     csk3.toString(false, true, 0, false);
     csk3.toString();
     assertEquals(csk3.getEstimate(), localEst);
@@ -301,8 +301,8 @@ public void checkEstMode() {
     final int k = 1 << lgK;
     final boolean useSeg = true;
     final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg);
-    final UpdateSketch shared = sl.shared;
-    final UpdateSketch local = sl.local;
+    final UpdatableThetaSketch shared = sl.shared;
+    final UpdatableThetaSketch local = sl.local;
 
     assertTrue(local.isEmpty());
     final int u = 3*k;
@@ -318,8 +318,8 @@ public void checkErrorBounds() {
     final int k = 1 << lgK;
     final boolean useSeg = true;
     final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg);
-    final UpdateSketch shared = sl.shared;
-    final UpdateSketch local = sl.local;
+    final UpdatableThetaSketch shared = sl.shared;
+    final UpdatableThetaSketch local = sl.local;
 
     //Exact mode
     for (int i = 0; i < k; i++ ) { local.update(i); }
@@ -353,8 +353,8 @@ public void checkUpperAndLowerBounds() {
     final int u = 2*k;
     final boolean useSeg = true;
     final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg);
-    final UpdateSketch shared = sl.shared;
-    final UpdateSketch local = sl.local;
+    final UpdatableThetaSketch shared = sl.shared;
+    final UpdatableThetaSketch local = sl.local;
 
     for (int i = 0; i < u; i++ ) { local.update(i); }
     waitForBgPropagationToComplete(shared);
@@ -373,8 +373,8 @@ public void checkRebuild() {
     final int u = 4*k;
     final boolean useSeg = true;
     final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg);
-    final UpdateSketch shared = sl.shared;
-    final UpdateSketch local = sl.local;
+    final UpdatableThetaSketch shared = sl.shared;
+    final UpdatableThetaSketch local = sl.local;
 
     assertTrue(local.isEmpty());
 
@@ -399,8 +399,8 @@ public void checkResetAndStartingSubMultiple() {
     final int k = 1 << lgK;
     final boolean useSeg = true;
     final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg);
-    final UpdateSketch shared = sl.shared;
-    final UpdateSketch local = sl.local;
+    final UpdatableThetaSketch shared = sl.shared;
+    final UpdatableThetaSketch local = sl.local;
 
     assertTrue(local.isEmpty());
 
@@ -427,8 +427,8 @@ public void checkExactModeMemorySegmentArr() {
     final int u = k;
     final boolean useSeg = true;
     final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg);
-    final UpdateSketch shared = sl.shared;
-    final UpdateSketch local = sl.local;
+    final UpdatableThetaSketch shared = sl.shared;
+    final UpdatableThetaSketch local = sl.local;
     assertTrue(local.isEmpty());
 
     for (int i = 0; i< u; i++) { local.update(i); }
@@ -444,8 +444,8 @@ public void checkEstModeMemorySegmentArr() {
     final int k = 1 << lgK;
     final boolean useSeg = true;
     final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg);
-    final UpdateSketch shared = sl.shared;
-    final UpdateSketch local = sl.local;
+    final UpdatableThetaSketch shared = sl.shared;
+    final UpdatableThetaSketch local = sl.local;
     assertTrue(local.isEmpty());
 
     final int u = 3*k;
@@ -463,8 +463,8 @@ public void checkEstModeNativeMemorySegment() {
     final int k = 1 << lgK;
     final boolean useSeg = true;
     final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg);
-    final UpdateSketch shared = sl.shared;
-    final UpdateSketch local = sl.local;
+    final UpdatableThetaSketch shared = sl.shared;
+    final UpdatableThetaSketch local = sl.local;
     assertTrue(local.isEmpty());
 
     final int u = 3*k;
@@ -481,8 +481,8 @@ public void checkConstructReconstructFromMemorySegment() {
     final int k = 1 << lgK;
     final boolean useSeg = true;
     final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg);
-    UpdateSketch shared = sl.shared;
-    final UpdateSketch local = sl.local;
+    UpdatableThetaSketch shared = sl.shared;
+    final UpdatableThetaSketch local = sl.local;
 
     assertTrue(local.isEmpty());
     final int u = 3*k;
@@ -500,13 +500,13 @@ public void checkConstructReconstructFromMemorySegment() {
 
     serArr = shared.toByteArray();
     final MemorySegment seg = MemorySegment.ofArray(serArr);
-    final UpdateSketch recoveredShared = UpdateSketch.wrap(seg);
+    final UpdatableThetaSketch recoveredShared = UpdatableThetaSketch.wrap(seg);
 
     //reconstruct to Native/Direct
     final int bytes = ThetaSketch.getMaxUpdateSketchBytes(k);
     final MemorySegment wseg = MemorySegment.ofArray(new byte[bytes]);
     shared = sl.bldr.buildSharedFromSketch(recoveredShared, wseg);
-    final UpdateSketch local2 = sl.bldr.buildLocal(shared);
+    final UpdatableThetaSketch local2 = sl.bldr.buildLocal(shared);
     est2 = local2.getEstimate();
 
     assertEquals(est2, est1, 0.0);
@@ -515,9 +515,9 @@ public void checkConstructReconstructFromMemorySegment() {
   @Test
   public void checkNullMemorySegment() {
     final UpdateSketchBuilder bldr = new UpdateSketchBuilder();
-    final UpdateSketch sk = bldr.build();
+    final UpdatableThetaSketch sk = bldr.build();
     for (int i = 0; i < 1000; i++) { sk.update(i); }
-    final UpdateSketch shared = bldr.buildSharedFromSketch(sk, null);
+    final UpdatableThetaSketch shared = bldr.buildSharedFromSketch(sk, null);
     assertEquals(shared.getRetainedEntries(true), 1000);
     assertFalse(shared.hasMemorySegment());
   }
@@ -529,7 +529,7 @@ public void checkResizeInBigSeg() {
     final int u = 1 << 20;
     final boolean useSeg = true;
     final SharedLocal sl = new SharedLocal(lgK, lgK, SEED, useSeg, true, 8); //seg is 8X larger than needed
-    final UpdateSketch local = sl.local;
+    final UpdatableThetaSketch local = sl.local;
 
     for (int i = 0; i < u; i++) { local.update(i); }
   }
@@ -558,7 +558,7 @@ public void checkHeapifyIllegalFamilyID_heapify() {
     final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg);
     sl.wseg.set(JAVA_BYTE, FAMILY_BYTE, (byte) 0); //corrupt the Family ID byte
     //try to heapify the corrupted seg
-    ThetaSketch.heapify(sl.wseg); //catch in Sketch.constructHeapSketch
+    ThetaSketch.heapify(sl.wseg); //catch in ThetaSketch.constructHeapSketch
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -577,8 +577,8 @@ public void checkBackgroundPropagation() {
     final int u = 10*k;
     final boolean useSeg = true;
     final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg);
-    final UpdateSketch shared = sl.shared;
-    final UpdateSketch local = sl.local;
+    final UpdatableThetaSketch shared = sl.shared;
+    final UpdatableThetaSketch local = sl.local;
     assertTrue(local.isEmpty());
     final ConcurrentHeapThetaBuffer sk1 = (ConcurrentHeapThetaBuffer)local; //for internal checks
 
@@ -615,8 +615,8 @@ public void checkBadSerVer() {
     final int k = 1 << lgK;
     final boolean useSeg = true;
     final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg);
-    final UpdateSketch shared = sl.shared;
-    final UpdateSketch local = sl.local;
+    final UpdatableThetaSketch shared = sl.shared;
+    final UpdatableThetaSketch local = sl.local;
     assertTrue(local.isEmpty());
 
     for (int i = 0; i< k; i++) { local.update(i); }
@@ -636,9 +636,9 @@ public void checkWrapIllegalFamilyID_wrap() {
     final boolean useSeg = true;
     final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg);
 
-    sl.wseg.set(JAVA_BYTE, FAMILY_BYTE, (byte) 0); //corrupt the Sketch ID byte
+    sl.wseg.set(JAVA_BYTE, FAMILY_BYTE, (byte) 0); //corrupt the FamilyID byte
     //try to wrap the corrupted seg
-    ThetaSketch.wrap(sl.wseg); //catch in Sketch.constructDirectSketch
+    ThetaSketch.wrap(sl.wseg); //catch in ThetaSketch.constructDirectSketch
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -647,7 +647,7 @@ public void checkWrapIllegalFamilyID_direct() {
     final boolean useSeg = true;
     final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg);
 
-    sl.wseg.set(JAVA_BYTE, FAMILY_BYTE, (byte) 0); //corrupt the Sketch ID byte
+    sl.wseg.set(JAVA_BYTE, FAMILY_BYTE, (byte) 0); //corrupt the FamilyID byte
     //try to wrap the corrupted seg
     DirectQuickSelectSketch.writableWrap(sl.wseg, null, Util.DEFAULT_UPDATE_SEED);
   }
@@ -659,7 +659,7 @@ public void checkHeapifySeedConflict() {
     final long seed2 = Util.DEFAULT_UPDATE_SEED;
     final boolean useSeg = true;
     final SharedLocal sl = new SharedLocal(lgK, lgK, seed1, useSeg, true, 1);
-    final UpdateSketch shared = sl.shared;
+    final UpdatableThetaSketch shared = sl.shared;
 
     final MemorySegment srcSeg = MemorySegment.ofArray(shared.toByteArray()).asReadOnly();
     ThetaSketch.heapify(srcSeg, seed2);
@@ -680,7 +680,7 @@ public void checkIllegalHashUpdate() {
     final int lgK = 4;
     final boolean useSeg = true;
     final SharedLocal sl = new SharedLocal(lgK, lgK, useSeg);
-    final UpdateSketch shared = sl.shared;
+    final UpdatableThetaSketch shared = sl.shared;
     shared.hashUpdate(1);
   }
 
diff --git a/src/test/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketchTest.java b/src/test/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketchTest.java
index e3f4e8823..393f79adb 100644
--- a/src/test/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketchTest.java
+++ b/src/test/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketchTest.java
@@ -48,8 +48,8 @@ public void checkBadSerVer() {
     final int k = 1 << lgK;
     final int u = k;
     final SharedLocal sl = new SharedLocal(lgK);
-    final UpdateSketch shared = sl.shared;
-    final UpdateSketch local = sl.local;
+    final UpdatableThetaSketch shared = sl.shared;
+    final UpdatableThetaSketch local = sl.local;
 
     assertTrue(local.isEmpty());
 
@@ -77,8 +77,8 @@ public void checkPropagationNotOrdered() {
     final int k = 1 << lgK;
     final int u = 200*k;
     final SharedLocal sl = new SharedLocal(lgK, 4, false, false);
-    final UpdateSketch shared = sl.shared;
-    final UpdateSketch local = sl.local;
+    final UpdatableThetaSketch shared = sl.shared;
+    final UpdatableThetaSketch local = sl.local;
     assertEquals((sl.bldr.getConCurLgNominalEntries()), 4);
     assertTrue(local.isEmpty());
 
@@ -98,8 +98,8 @@ public void checkIllegalSketchID_UpdateSketch() {
     final int u = k;
     final SharedLocal sl = new SharedLocal(lgK);
 
-    final UpdateSketch shared = sl.shared;
-    final UpdateSketch local = sl.local;
+    final UpdatableThetaSketch shared = sl.shared;
+    final UpdatableThetaSketch local = sl.local;
     assertTrue(local.isEmpty());
     assertTrue(shared instanceof ConcurrentHeapQuickSelectSketch);
     for (int i = 0; i< u; i++) {
@@ -112,7 +112,7 @@ public void checkIllegalSketchID_UpdateSketch() {
     assertEquals(shared.getRetainedEntries(false), u);
     final byte[] byteArray = shared.toByteArray();
     final MemorySegment seg = MemorySegment.ofArray(byteArray);
-    seg.set(JAVA_BYTE, FAMILY_BYTE, (byte) 0); //corrupt the Sketch ID byte
+    seg.set(JAVA_BYTE, FAMILY_BYTE, (byte) 0); //corrupt the FamilyID byte
 
     //try to heapify the corrupted seg
     ThetaSketch.heapify(seg, sl.seed);
@@ -152,8 +152,8 @@ public void checkHeapifyByteArrayExact() {
     final int k = 1 << lgK;
     final int u = k;
     final SharedLocal sl = new SharedLocal(lgK);
-    UpdateSketch shared = sl.shared;
-    final UpdateSketch local = sl.local;
+    UpdatableThetaSketch shared = sl.shared;
+    final UpdatableThetaSketch local = sl.local;
 
     for (int i=0; i Next, we recover the Union SetOp and the 3 sketches and the space for the result. Then
-   * recompute the union using a Union of the same size as the input sketches, where the end result
+   * 
 Next, we recover the ThetaUnion SetOp and the 3 sketches and the space for the result. Then
+   * recompute the union using a ThetaUnion of the same size as the input sketches, where the end result
    * will be an estimate.
    */
   @Test
   public void checkDirectUnionExample() {
     //The first task is to compute how much off-heap space we need and set the heap large enough.
-    //For the first trial, we will set the Union large enough for an exact result for THIS example.
+    //For the first trial, we will set the ThetaUnion large enough for an exact result for THIS example.
     final int sketchNomEntries = 1 << 14; //16K
     int unionNomEntries = 1 << 15;  //32K
     final int[] heapLayout = getHeapLayout(sketchNomEntries, unionNomEntries);
@@ -273,38 +273,38 @@ public void checkDirectUnionExample() {
   public void setOpsExample() {
     println("Set Operations Example:");
     final int k = 4096;
-    final UpdateSketch skA = UpdateSketch.builder().setNominalEntries(k).build();
-    final UpdateSketch skB = UpdateSketch.builder().setNominalEntries(k).build();
-    final UpdateSketch skC = UpdateSketch.builder().setNominalEntries(k).build();
+    final UpdatableThetaSketch skA = UpdatableThetaSketch.builder().setNominalEntries(k).build();
+    final UpdatableThetaSketch skB = UpdatableThetaSketch.builder().setNominalEntries(k).build();
+    final UpdatableThetaSketch skC = UpdatableThetaSketch.builder().setNominalEntries(k).build();
 
     for (int i=1;  i<=10; i++) { skA.update(i); }
     for (int i=1;  i<=20; i++) { skB.update(i); }
     for (int i=6;  i<=15; i++) { skC.update(i); } //overlapping set
 
-    final Union union = SetOperation.builder().setNominalEntries(k).buildUnion();
+    final ThetaUnion union = ThetaSetOperation.builder().setNominalEntries(k).buildUnion();
     union.union(skA);
     union.union(skB);
     // ... continue to iterate on the input sketches to union
 
-    final CompactSketch unionSk = union.getResult();   //the result union sketch
+    final CompactThetaSketch unionSk = union.getResult();   //the result union sketch
     println("A U B      : "+unionSk.getEstimate());   //the estimate of the union
 
-    //Intersection is similar
+    //ThetaIntersection is similar
 
-    final Intersection inter = SetOperation.builder().buildIntersection();
+    final ThetaIntersection inter = ThetaSetOperation.builder().buildIntersection();
     inter.intersect(unionSk);
     inter.intersect(skC);
     // ... continue to iterate on the input sketches to intersect
 
-    final CompactSketch interSk = inter.getResult();  //the result intersection sketch
+    final CompactThetaSketch interSk = inter.getResult();  //the result intersection sketch
     println("(A U B) ^ C: "+interSk.getEstimate());  //the estimate of the intersection
 
-    //The AnotB operation is a little different as it is stateless:
+    //The ThetaAnotB operation is a little different as it is stateless:
 
-    final AnotB aNotB = SetOperation.builder().buildANotB();
-    final CompactSketch not = aNotB.aNotB(skA, skC);
+    final ThetaAnotB aNotB = ThetaSetOperation.builder().buildANotB();
+    final CompactThetaSketch not = aNotB.aNotB(skA, skC);
 
-    println("A \\ C      : "+not.getEstimate()); //the estimate of the AnotB operation
+    println("A \\ C      : "+not.getEstimate()); //the estimate of the ThetaAnotB operation
   }
 
   @Test
@@ -312,15 +312,15 @@ public void checkIsSameResource() {
     final int k = 16;
     final MemorySegment wseg = MemorySegment.ofArray(new byte[k*16 + 32]);//288
     final MemorySegment emptySeg = MemorySegment.ofArray(new byte[8]);
-    final Union union = SetOperation.builder().setNominalEntries(k).buildUnion(wseg);
+    final ThetaUnion union = ThetaSetOperation.builder().setNominalEntries(k).buildUnion(wseg);
     assertTrue(union.isSameResource(wseg));
     assertFalse(union.isSameResource(emptySeg));
 
-    final Intersection inter = SetOperation.builder().buildIntersection(wseg);
+    final ThetaIntersection inter = ThetaSetOperation.builder().buildIntersection(wseg);
     assertTrue(inter.isSameResource(wseg));
     assertFalse(inter.isSameResource(emptySeg));
 
-    final AnotB aNotB = SetOperation.builder().buildANotB();
+    final ThetaAnotB aNotB = ThetaSetOperation.builder().buildANotB();
 
     assertFalse(aNotB.isSameResource(emptySeg));
   }
@@ -338,17 +338,17 @@ static void println(final String s) {
   }
 
   /**
-   * Compute offsets for MyHeap for Union, sketch1, sketch2, sketch3, resultSketch, total layout.
+   * Compute offsets for MyHeap for ThetaUnion, sketch1, sketch2, sketch3, resultSketch, total layout.
    * @param sketchNomEntries the configured nominal entries of the sketch
    * @param unionNomEntries configured nominal entries of the union
-   * @return array of offsets for Union, sketch1, sketch2, sketch3, resultSketch, total layout
+   * @return array of offsets for ThetaUnion, sketch1, sketch2, sketch3, resultSketch, total layout
    */
   private static int[] getHeapLayout(final int sketchNomEntries, final int unionNomEntries) {
     final int[] heapLayout = new int[6];
-    final int unionBytes = SetOperation.getMaxUnionBytes(unionNomEntries);
+    final int unionBytes = ThetaSetOperation.getMaxUnionBytes(unionNomEntries);
     final int sketchBytes = getMaxUpdateSketchBytes(sketchNomEntries);
     final int resultBytes = ThetaSketch.getMaxCompactSketchBytes(unionNomEntries);
-    heapLayout[0] = 0;                             //offset for Union
+    heapLayout[0] = 0;                             //offset for ThetaUnion
     heapLayout[1] = unionBytes;                    //offset for sketch1
     heapLayout[2] = unionBytes + sketchBytes;      //offset for sketch2
     heapLayout[3] = unionBytes + 2*sketchBytes;    //offset for sketch3
@@ -364,7 +364,7 @@ private static double directUnionTrial1(
     final int bytes = heapLayout[1] - offset;
     final MemorySegment unionSeg = heapSeg.asSlice(offset, bytes);
 
-    Union union = SetOperation.builder().setNominalEntries(unionNomEntries).buildUnion(unionSeg);
+    ThetaUnion union = ThetaSetOperation.builder().setNominalEntries(unionNomEntries).buildUnion(unionSeg);
 
     final MemorySegment sketch1seg = heapSeg.asSlice(heapLayout[1], heapLayout[2]-heapLayout[1]);
     final MemorySegment sketch2seg = heapSeg.asSlice(heapLayout[2], heapLayout[3]-heapLayout[2]);
@@ -372,9 +372,9 @@ private static double directUnionTrial1(
     final MemorySegment resultSeg = heapSeg.asSlice(heapLayout[4], heapLayout[5]-heapLayout[4]);
 
     //Initialize the 3 sketches
-    final UpdateSketch sk1 = UpdateSketch.builder().setNominalEntries(sketchNomEntries).build(sketch1seg);
-    final UpdateSketch sk2 = UpdateSketch.builder().setNominalEntries(sketchNomEntries).build(sketch2seg);
-    final UpdateSketch sk3 = UpdateSketch.builder().setNominalEntries(sketchNomEntries).build(sketch3seg);
+    final UpdatableThetaSketch sk1 = UpdatableThetaSketch.builder().setNominalEntries(sketchNomEntries).build(sketch1seg);
+    final UpdatableThetaSketch sk2 = UpdatableThetaSketch.builder().setNominalEntries(sketchNomEntries).build(sketch2seg);
+    final UpdatableThetaSketch sk3 = UpdatableThetaSketch.builder().setNominalEntries(sketchNomEntries).build(sketch3seg);
 
     //This little trial has sk1 and sk2 distinct and sk2 overlap both.
     //Build the sketches.
@@ -394,7 +394,7 @@ private static double directUnionTrial1(
     union.union(sk2);
 
     //Let's recover the union and the 3rd sketch
-    union = Union.wrap(unionSeg);
+    union = ThetaUnion.wrap(unionSeg);
     union.union(ThetaSketch.wrap(sketch3seg));
 
     final ThetaSketch resSk = union.getResult(true, resultSeg);
@@ -413,9 +413,9 @@ private static double directUnionTrial2(
     final MemorySegment resultSeg = heapSeg.asSlice(heapLayout[4], heapLayout[5]-heapLayout[4]);
 
     //Recover the 3 sketches
-    final UpdateSketch sk1 = (UpdateSketch) ThetaSketch.wrap(sketch1seg);
-    final UpdateSketch sk2 = (UpdateSketch) ThetaSketch.wrap(sketch2seg);
-    final UpdateSketch sk3 = (UpdateSketch) ThetaSketch.wrap(sketch3seg);
+    final UpdatableThetaSketch sk1 = (UpdatableThetaSketch) ThetaSketch.wrap(sketch1seg);
+    final UpdatableThetaSketch sk2 = (UpdatableThetaSketch) ThetaSketch.wrap(sketch2seg);
+    final UpdatableThetaSketch sk3 = (UpdatableThetaSketch) ThetaSketch.wrap(sketch3seg);
 
     //confirm that each of these 3 sketches is exact.
     assertEquals(sk1.getEstimate(), sketchNomEntries, 0.0);
@@ -424,7 +424,7 @@ private static double directUnionTrial2(
 
     //Create a new union in the same space with a smaller size.
     Util.clear(unionSeg);
-    final Union union = SetOperation.builder().setNominalEntries(unionNomEntries).buildUnion(unionSeg);
+    final ThetaUnion union = ThetaSetOperation.builder().setNominalEntries(unionNomEntries).buildUnion(unionSeg);
     union.union(sk1);
     union.union(sk2);
     union.union(sk3);
diff --git a/src/test/java/org/apache/datasketches/theta/SetOpsCornerCasesTest.java b/src/test/java/org/apache/datasketches/theta/SetOpsCornerCasesTest.java
index 80a876991..06bbd4dd7 100644
--- a/src/test/java/org/apache/datasketches/theta/SetOpsCornerCasesTest.java
+++ b/src/test/java/org/apache/datasketches/theta/SetOpsCornerCasesTest.java
@@ -30,13 +30,6 @@
 import java.lang.foreign.MemorySegment;
 import java.util.Random;
 
-import org.apache.datasketches.theta.AnotB;
-import org.apache.datasketches.theta.CompactSketch;
-import org.apache.datasketches.theta.Intersection;
-import org.apache.datasketches.theta.SetOperation;
-import org.apache.datasketches.theta.ThetaSketch;
-import org.apache.datasketches.theta.Union;
-import org.apache.datasketches.theta.UpdateSketch;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -57,38 +50,38 @@ public void checkSetOpsRandom() {
   }
 
   private static void compareSetOpsRandom(final int k, final int loA, final int hiA, final int loB, final int hiB) {
-    final UpdateSketch tskA = UpdateSketch.builder().setNominalEntries(k).build();
-    final UpdateSketch tskB = UpdateSketch.builder().setNominalEntries(k).build();
+    final UpdatableThetaSketch tskA = UpdatableThetaSketch.builder().setNominalEntries(k).build();
+    final UpdatableThetaSketch tskB = UpdatableThetaSketch.builder().setNominalEntries(k).build();
 
     for (int i = loA; i < hiA; i++) { tskA.update(i); }
     for (int i = loB; i < hiB; i++) { tskB.update(i); }
 
-    final CompactSketch rcskStdU = doStdUnion(tskA, tskB, k, null);
-    final CompactSketch rcskPwU = doPwUnion(tskA, tskB, k);
+    final CompactThetaSketch rcskStdU = doStdUnion(tskA, tskB, k, null);
+    final CompactThetaSketch rcskPwU = doPwUnion(tskA, tskB, k);
     checkCornerCase(rcskPwU, rcskStdU);
 
-    final CompactSketch rcskStdPairU = doStdPairUnion(tskA, tskB, k, null);
+    final CompactThetaSketch rcskStdPairU = doStdPairUnion(tskA, tskB, k, null);
     checkCornerCase(rcskStdPairU, rcskStdU);
 
-    final CompactSketch rcskStdI = doStdIntersection(tskA, tskB, null);
-    final CompactSketch rcskPwI = doPwIntersection(tskA, tskB);
+    final CompactThetaSketch rcskStdI = doStdIntersection(tskA, tskB, null);
+    final CompactThetaSketch rcskPwI = doPwIntersection(tskA, tskB);
     checkCornerCase(rcskPwI, rcskStdI);
 
-    final CompactSketch rcskStdPairI = doStdPairIntersection(tskA, tskB, null);
+    final CompactThetaSketch rcskStdPairI = doStdPairIntersection(tskA, tskB, null);
     checkCornerCase(rcskStdPairI, rcskStdI);
 
-    final CompactSketch rcskStdAnotB = doStdAnotB(tskA, tskB, null);
-    final CompactSketch rcskPwAnotB = doPwAnotB(tskA, tskB);
+    final CompactThetaSketch rcskStdAnotB = doStdAnotB(tskA, tskB, null);
+    final CompactThetaSketch rcskPwAnotB = doPwAnotB(tskA, tskB);
     checkCornerCase(rcskPwAnotB, rcskStdAnotB);
 
-    final CompactSketch rcskStdStatefulAnotB = doStdStatefulAnotB(tskA, tskB, null);
+    final CompactThetaSketch rcskStdStatefulAnotB = doStdStatefulAnotB(tskA, tskB, null);
     checkCornerCase(rcskStdStatefulAnotB, rcskStdAnotB);
   }
 
   /*******************************************/
 
   @Test
-  //Check all corner cases against standard Union, Intersection, and AnotB.
+  //Check all corner cases against standard ThetaUnion, ThetaIntersection, and ThetaAnotB.
   //The unordered case is not tested
   public void compareCornerCases() {
     final int k = 64;
@@ -108,121 +101,121 @@ public void compareCornerCases() {
 
   private static void cornerCaseChecksMemorySegment(final State stateA, final State stateB, final int k) {
     println("StateA: " + stateA + ", StateB: " + stateB);
-    final CompactSketch tcskA = generate(stateA, k);
-    final CompactSketch tcskB = generate(stateB, k);
+    final CompactThetaSketch tcskA = generate(stateA, k);
+    final CompactThetaSketch tcskB = generate(stateB, k);
 
-    MemorySegment wseg = MemorySegment.ofArray(new byte[SetOperation.getMaxUnionBytes(k)]);
+    MemorySegment wseg = MemorySegment.ofArray(new byte[ThetaSetOperation.getMaxUnionBytes(k)]);
 
-    CompactSketch rcskStdU = doStdUnion(tcskA, tcskB, k, null);
-    final CompactSketch rcskPwU = doPwUnion(tcskA, tcskB, k);
+    CompactThetaSketch rcskStdU = doStdUnion(tcskA, tcskB, k, null);
+    final CompactThetaSketch rcskPwU = doPwUnion(tcskA, tcskB, k);
     checkCornerCase(rcskPwU, rcskStdU); //heap, heap
 
     rcskStdU = doStdUnion(tcskA, tcskB, k, wseg);
-    final CompactSketch rcskStdPairU = doStdPairUnion(tcskA, tcskB, k, wseg);
+    final CompactThetaSketch rcskStdPairU = doStdPairUnion(tcskA, tcskB, k, wseg);
     checkCornerCase(rcskStdPairU, rcskStdU); //direct, direct
 
-    wseg = MemorySegment.ofArray(new byte[SetOperation.getMaxIntersectionBytes(k)]);
+    wseg = MemorySegment.ofArray(new byte[ThetaSetOperation.getMaxIntersectionBytes(k)]);
 
-    CompactSketch rcskStdI = doStdIntersection(tcskA, tcskB, null);
-    final CompactSketch rcskPwI = doPwIntersection(tcskA, tcskB);
+    CompactThetaSketch rcskStdI = doStdIntersection(tcskA, tcskB, null);
+    final CompactThetaSketch rcskPwI = doPwIntersection(tcskA, tcskB);
     checkCornerCase(rcskPwI, rcskStdI); //empty, empty
 
     rcskStdI = doStdIntersection(tcskA, tcskB, wseg);
-    final CompactSketch rcskStdPairI = doStdPairIntersection(tcskA, tcskB, wseg);
+    final CompactThetaSketch rcskStdPairI = doStdPairIntersection(tcskA, tcskB, wseg);
     checkCornerCase(rcskStdPairI, rcskStdI); //empty, empty //direct, direct???
 
-    wseg = MemorySegment.ofArray(new byte[SetOperation.getMaxAnotBResultBytes(k)]);
+    wseg = MemorySegment.ofArray(new byte[ThetaSetOperation.getMaxAnotBResultBytes(k)]);
 
-    CompactSketch rcskStdAnotB = doStdAnotB(tcskA, tcskB, null);
-    final CompactSketch rcskPwAnotB = doPwAnotB(tcskA, tcskB);
+    CompactThetaSketch rcskStdAnotB = doStdAnotB(tcskA, tcskB, null);
+    final CompactThetaSketch rcskPwAnotB = doPwAnotB(tcskA, tcskB);
     checkCornerCase(rcskPwAnotB, rcskStdAnotB); //heap, heap
 
     rcskStdAnotB = doStdAnotB(tcskA, tcskB, wseg);
-    final CompactSketch rcskStdStatefulAnotB = doStdStatefulAnotB(tcskA, tcskB, wseg);
+    final CompactThetaSketch rcskStdStatefulAnotB = doStdStatefulAnotB(tcskA, tcskB, wseg);
     checkCornerCase(rcskStdStatefulAnotB, rcskStdAnotB); //direct, heap
   }
 
   private static void cornerCaseChecks(final State stateA, final State stateB, final int k) {
     println("StateA: " + stateA + ", StateB: " + stateB);
-    final CompactSketch tcskA = generate(stateA, k);
-    final CompactSketch tcskB = generate(stateB, k);
+    final CompactThetaSketch tcskA = generate(stateA, k);
+    final CompactThetaSketch tcskB = generate(stateB, k);
 
-    final CompactSketch rcskStdU = doStdUnion(tcskA, tcskB, k, null);
-    final CompactSketch rcskPwU = doPwUnion(tcskA, tcskB, k);
+    final CompactThetaSketch rcskStdU = doStdUnion(tcskA, tcskB, k, null);
+    final CompactThetaSketch rcskPwU = doPwUnion(tcskA, tcskB, k);
     checkCornerCase(rcskPwU, rcskStdU);
 
-    final CompactSketch rcskStdPairU = doStdPairUnion(tcskA, tcskB, k, null);
+    final CompactThetaSketch rcskStdPairU = doStdPairUnion(tcskA, tcskB, k, null);
     checkCornerCase(rcskStdPairU, rcskStdU);
 
-    final CompactSketch rcskStdI = doStdIntersection(tcskA, tcskB, null);
-    final CompactSketch rcskPwI = doPwIntersection(tcskA, tcskB);
+    final CompactThetaSketch rcskStdI = doStdIntersection(tcskA, tcskB, null);
+    final CompactThetaSketch rcskPwI = doPwIntersection(tcskA, tcskB);
     checkCornerCase(rcskPwI, rcskStdI);
 
-    final CompactSketch rcskStdPairI = doStdPairIntersection(tcskA, tcskB, null);
+    final CompactThetaSketch rcskStdPairI = doStdPairIntersection(tcskA, tcskB, null);
     checkCornerCase(rcskStdPairI, rcskStdI);
 
-    final CompactSketch rcskStdAnotB = doStdAnotB(tcskA, tcskB, null);
-    final CompactSketch rcskPwAnotB = doPwAnotB(tcskA, tcskB);
+    final CompactThetaSketch rcskStdAnotB = doStdAnotB(tcskA, tcskB, null);
+    final CompactThetaSketch rcskPwAnotB = doPwAnotB(tcskA, tcskB);
     checkCornerCase(rcskPwAnotB, rcskStdAnotB);
 
-    final CompactSketch rcskStdStatefulAnotB = doStdStatefulAnotB(tcskA, tcskB, null);
+    final CompactThetaSketch rcskStdStatefulAnotB = doStdStatefulAnotB(tcskA, tcskB, null);
     checkCornerCase(rcskStdStatefulAnotB, rcskStdAnotB);
   }
 
-  private static CompactSketch doStdUnion(final ThetaSketch tskA, final ThetaSketch tskB, final int k, final MemorySegment wseg) {
-    final Union union = SetOperation.builder().setNominalEntries(k).buildUnion();
+  private static CompactThetaSketch doStdUnion(final ThetaSketch tskA, final ThetaSketch tskB, final int k, final MemorySegment wseg) {
+    final ThetaUnion union = ThetaSetOperation.builder().setNominalEntries(k).buildUnion();
     union.union(tskA);
     union.union(tskB);
     return union.getResult(true, wseg);
   }
 
-  private static CompactSketch doStdPairUnion(final ThetaSketch tskA, final ThetaSketch tskB, final int k, final MemorySegment wseg) {
-    final Union union = SetOperation.builder().setNominalEntries(k).buildUnion();
+  private static CompactThetaSketch doStdPairUnion(final ThetaSketch tskA, final ThetaSketch tskB, final int k, final MemorySegment wseg) {
+    final ThetaUnion union = ThetaSetOperation.builder().setNominalEntries(k).buildUnion();
     return union.union(tskA, tskB, true, wseg);
   }
 
-  private static CompactSketch doStdIntersection(final ThetaSketch tskA, final ThetaSketch tskB, final MemorySegment wseg) {
-    final Intersection inter = SetOperation.builder().buildIntersection();
+  private static CompactThetaSketch doStdIntersection(final ThetaSketch tskA, final ThetaSketch tskB, final MemorySegment wseg) {
+    final ThetaIntersection inter = ThetaSetOperation.builder().buildIntersection();
     inter.intersect(tskA);
     inter.intersect(tskB);
     return inter.getResult(true, wseg);
   }
 
-  private static CompactSketch doStdPairIntersection(final ThetaSketch tskA, final ThetaSketch tskB, final MemorySegment wseg) {
-    final Intersection inter = SetOperation.builder().buildIntersection();
+  private static CompactThetaSketch doStdPairIntersection(final ThetaSketch tskA, final ThetaSketch tskB, final MemorySegment wseg) {
+    final ThetaIntersection inter = ThetaSetOperation.builder().buildIntersection();
     return inter.intersect(tskA, tskB, true, wseg);
   }
 
-  private static CompactSketch doStdAnotB(final ThetaSketch tskA, final ThetaSketch tskB, final MemorySegment wseg) {
-    final AnotB anotb = SetOperation.builder().buildANotB();
+  private static CompactThetaSketch doStdAnotB(final ThetaSketch tskA, final ThetaSketch tskB, final MemorySegment wseg) {
+    final ThetaAnotB anotb = ThetaSetOperation.builder().buildANotB();
     return anotb.aNotB(tskA, tskB, true, wseg);
   }
 
-  private static CompactSketch doStdStatefulAnotB(final ThetaSketch tskA, final ThetaSketch tskB, final MemorySegment wseg) {
-    final AnotB anotb = SetOperation.builder().buildANotB();
+  private static CompactThetaSketch doStdStatefulAnotB(final ThetaSketch tskA, final ThetaSketch tskB, final MemorySegment wseg) {
+    final ThetaAnotB anotb = ThetaSetOperation.builder().buildANotB();
     anotb.setA(tskA);
     anotb.notB(tskB);
     anotb.getResult(false);
     return anotb.getResult(true, wseg, true);
   }
 
-  private static CompactSketch doPwUnion(final ThetaSketch tskA, final ThetaSketch tskB, final int k) {
-    CompactSketch tcskA, tcskB;
+  private static CompactThetaSketch doPwUnion(final ThetaSketch tskA, final ThetaSketch tskB, final int k) {
+    CompactThetaSketch tcskA, tcskB;
     if (tskA == null) { tcskA = null; }
-    else { tcskA = (tskA instanceof CompactSketch) ? (CompactSketch) tskA : tskA.compact(); }
+    else { tcskA = (tskA instanceof CompactThetaSketch) ? (CompactThetaSketch) tskA : tskA.compact(); }
     if (tskB == null) { tcskB = null; }
-    else { tcskB = (tskB instanceof CompactSketch) ? (CompactSketch) tskB : tskB.compact(); }
-    final Union union = SetOperation.builder().setNominalEntries(k).buildUnion();
+    else { tcskB = (tskB instanceof CompactThetaSketch) ? (CompactThetaSketch) tskB : tskB.compact(); }
+    final ThetaUnion union = ThetaSetOperation.builder().setNominalEntries(k).buildUnion();
     return union.union(tcskA, tcskB);
   }
 
-  private static CompactSketch doPwIntersection(final ThetaSketch tskA, final ThetaSketch tskB) {
-    final Intersection inter = SetOperation.builder().buildIntersection();
+  private static CompactThetaSketch doPwIntersection(final ThetaSketch tskA, final ThetaSketch tskB) {
+    final ThetaIntersection inter = ThetaSetOperation.builder().buildIntersection();
     return inter.intersect(tskA, tskB);
   }
 
-  private static CompactSketch doPwAnotB(final ThetaSketch tskA, final ThetaSketch tskB) {
-    final AnotB aNotB = SetOperation.builder().buildANotB();
+  private static CompactThetaSketch doPwAnotB(final ThetaSketch tskA, final ThetaSketch tskB) {
+    final ThetaAnotB aNotB = ThetaSetOperation.builder().buildANotB();
     return aNotB.aNotB(tskA, tskB);
   }
 
@@ -248,11 +241,11 @@ private static void checkCornerCase(final ThetaSketch rskA, final ThetaSketch rs
   @Test
   public void checkUnionNotOrdered() {
     final int k = 64;
-    final CompactSketch skNull = generate(NULL, k);
-    final CompactSketch skEmpty = generate(EMPTY, k);
-    final CompactSketch skHeap = generate(EST_HEAP, k);
-    final CompactSketch skHeapUO = generate(EST_SEGMENT_UNORDERED, k);
-    final Union union = SetOperation.builder().setNominalEntries(k).buildUnion();
+    final CompactThetaSketch skNull = generate(NULL, k);
+    final CompactThetaSketch skEmpty = generate(EMPTY, k);
+    final CompactThetaSketch skHeap = generate(EST_HEAP, k);
+    final CompactThetaSketch skHeapUO = generate(EST_SEGMENT_UNORDERED, k);
+    final ThetaUnion union = ThetaSetOperation.builder().setNominalEntries(k).buildUnion();
     union.union(skNull, skHeapUO);
     union.union(skEmpty, skHeapUO);
     union.union(skHeapUO, skNull);
@@ -264,22 +257,22 @@ public void checkUnionNotOrdered() {
   @Test
   public void checkSeedHash() {
     final int k = 64;
-    final UpdateSketch tmp1 = UpdateSketch.builder().setNominalEntries(k).setSeed(123).build();
+    final UpdatableThetaSketch tmp1 = UpdatableThetaSketch.builder().setNominalEntries(k).setSeed(123).build();
     tmp1.update(1);
     tmp1.update(3);
-    final CompactSketch skSmallSeed2A = tmp1.compact(true, null);
+    final CompactThetaSketch skSmallSeed2A = tmp1.compact(true, null);
 
-    final UpdateSketch tmp2 = UpdateSketch.builder().setNominalEntries(k).setSeed(123).build();
+    final UpdatableThetaSketch tmp2 = UpdatableThetaSketch.builder().setNominalEntries(k).setSeed(123).build();
     tmp2.update(1);
     tmp2.update(2);
-    final CompactSketch skSmallSeed2B = tmp2.compact(true, null);
+    final CompactThetaSketch skSmallSeed2B = tmp2.compact(true, null);
 
-    final CompactSketch skExact = generate(EXACT, k);
-    final CompactSketch skHeap = generate(EST_HEAP, 2 * k);
+    final CompactThetaSketch skExact = generate(EXACT, k);
+    final CompactThetaSketch skHeap = generate(EST_HEAP, 2 * k);
 
-    final Intersection inter = SetOperation.builder().buildIntersection();
-    final AnotB aNotB = SetOperation.builder().buildANotB();
-    final Union union = SetOperation.builder().setNominalEntries(k).buildUnion();
+    final ThetaIntersection inter = ThetaSetOperation.builder().buildIntersection();
+    final ThetaAnotB aNotB = ThetaSetOperation.builder().buildANotB();
+    final ThetaUnion union = ThetaSetOperation.builder().setNominalEntries(k).buildUnion();
 
     //Intersect
     try {
@@ -315,7 +308,7 @@ public void checkSeedHash() {
       aNotB.aNotB(skHeap, skSmallSeed2B);
       Assert.fail();
     } catch (final Exception e) { } //pass
-    //Union
+    //ThetaUnion
     try {
       union.union(skExact, skSmallSeed2A);
       Assert.fail();
@@ -337,12 +330,12 @@ public void checkSeedHash() {
   @Test
   public void checkPwUnionReduceToK() {
     final int k = 16;
-    final CompactSketch skNull = generate(NULL, k);
-    final CompactSketch skEmpty = generate(EMPTY, k);
-    final CompactSketch skHeap1 = generate(EST_HEAP, k);
-    final CompactSketch skHeap2 = generate(EST_HEAP, k);
-    final Union union = SetOperation.builder().setNominalEntries(k).buildUnion();
-    CompactSketch csk;
+    final CompactThetaSketch skNull = generate(NULL, k);
+    final CompactThetaSketch skEmpty = generate(EMPTY, k);
+    final CompactThetaSketch skHeap1 = generate(EST_HEAP, k);
+    final CompactThetaSketch skHeap2 = generate(EST_HEAP, k);
+    final ThetaUnion union = ThetaSetOperation.builder().setNominalEntries(k).buildUnion();
+    CompactThetaSketch csk;
     csk = union.union(skNull, skHeap1);
     Assert.assertEquals(csk.getRetainedEntries(true), k);
     csk = union.union(skEmpty, skHeap1);
@@ -370,7 +363,7 @@ static void println(final String s) {
   @Test
   public void checkGenerator() {
     final int k = 16;
-    CompactSketch csk;
+    CompactThetaSketch csk;
 
     csk = generate(State.NULL, 0);
     assertNull(csk);
@@ -441,9 +434,9 @@ public void checkGenerator() {
 
   enum State {NULL, EMPTY, SINGLE, EXACT, EST_HEAP, THLT1_CNT0_FALSE, THEQ1_CNT0_TRUE, EST_SEGMENT_UNORDERED}
 
-  private static CompactSketch generate(final State state, final int k) {
-    UpdateSketch sk = null;
-    CompactSketch csk = null;
+  private static CompactThetaSketch generate(final State state, final int k) {
+    UpdatableThetaSketch sk = null;
+    CompactThetaSketch csk = null;
 
     switch(state) {
       case NULL : {
@@ -451,17 +444,17 @@ private static CompactSketch generate(final State state, final int k) {
         break;
       }
       case EMPTY : { //results in EmptyCompactSketch
-        csk = UpdateSketch.builder().setNominalEntries(k).build().compact(true, null);
+        csk = UpdatableThetaSketch.builder().setNominalEntries(k).build().compact(true, null);
         break;
       }
       case SINGLE : { //results in SingleItemSketches most of the time
-        sk = UpdateSketch.builder().setNominalEntries(k).build();
+        sk = UpdatableThetaSketch.builder().setNominalEntries(k).build();
         sk.update(1);
         csk = sk.compact(true, null);
         break;
       }
       case EXACT : {
-        sk = UpdateSketch.builder().setNominalEntries(k).build();
+        sk = UpdatableThetaSketch.builder().setNominalEntries(k).build();
         for (int i = 0; i < k; i++) {
           sk.update(i);
         }
@@ -469,7 +462,7 @@ private static CompactSketch generate(final State state, final int k) {
         break;
       }
       case EST_HEAP : {
-        sk = UpdateSketch.builder().setNominalEntries(k).build();
+        sk = UpdatableThetaSketch.builder().setNominalEntries(k).build();
         for (int i = 0; i < (4 * k); i++) {
           sk.update(i);
         }
@@ -477,20 +470,20 @@ private static CompactSketch generate(final State state, final int k) {
         break;
       }
       case THLT1_CNT0_FALSE : {
-        sk = UpdateSketch.builder().setP((float)0.5).setNominalEntries(k).build();
+        sk = UpdatableThetaSketch.builder().setP((float)0.5).setNominalEntries(k).build();
         sk.update(7); //above theta
         assert(sk.getRetainedEntries(true) == 0);
         csk = sk.compact(true, null); //compact as {Th < 1.0, 0, F}
         break;
       }
       case THEQ1_CNT0_TRUE : {
-        sk = UpdateSketch.builder().setP((float)0.5).setNominalEntries(k).build();
+        sk = UpdatableThetaSketch.builder().setP((float)0.5).setNominalEntries(k).build();
         assert(sk.getRetainedEntries(true) == 0);
         csk = sk.compact(true, null); //compact as {Th < 1.0, 0, T}
         break;
       }
       case EST_SEGMENT_UNORDERED : {
-        sk = UpdateSketch.builder().setNominalEntries(k).build();
+        sk = UpdatableThetaSketch.builder().setNominalEntries(k).build();
         for (int i = 0; i < (4 * k); i++) {
           sk.update(i);
         }
diff --git a/src/test/java/org/apache/datasketches/theta/SingleItemSketchTest.java b/src/test/java/org/apache/datasketches/theta/SingleItemSketchTest.java
index a0c3cd346..081d24629 100644
--- a/src/test/java/org/apache/datasketches/theta/SingleItemSketchTest.java
+++ b/src/test/java/org/apache/datasketches/theta/SingleItemSketchTest.java
@@ -42,7 +42,7 @@ public class SingleItemSketchTest {
 
   @Test
   public void check1() {
-    final Union union = SetOperation.builder().buildUnion();
+    final ThetaUnion union = ThetaSetOperation.builder().buildUnion();
     union.union(SingleItemSketch.create(1));
     union.union(SingleItemSketch.create(1.0));
     union.union(SingleItemSketch.create(0.0));
@@ -82,7 +82,7 @@ public void check1() {
   @Test
   public void check2() {
     final long seed = Util.DEFAULT_UPDATE_SEED;
-    final Union union = SetOperation.builder().buildUnion();
+    final ThetaUnion union = ThetaSetOperation.builder().buildUnion();
     union.union(SingleItemSketch.create(1, seed));
     union.union(SingleItemSketch.create(1.0, seed));
     union.union(SingleItemSketch.create(0.0, seed));
@@ -157,11 +157,11 @@ public void checkSerDe() {
     final SingleItemSketch sis3 = SingleItemSketch.heapify(seg , defaultSeedHash);
     assertEquals(sis3.getEstimate(), 1.0);
 
-    final Union union = SetOperation.builder().buildUnion();
+    final ThetaUnion union = ThetaSetOperation.builder().buildUnion();
     union.union(sis);
     union.union(sis2);
     union.union(sis3);
-    final CompactSketch csk = union.getResult();
+    final CompactThetaSketch csk = union.getResult();
     assertTrue(csk instanceof SingleItemSketch);
     assertEquals(union.getResult().getEstimate(), 1.0);
   }
@@ -176,7 +176,7 @@ public void checkRestricted() {
   @Test
   public void unionWrapped() {
     final ThetaSketch sketch = SingleItemSketch.create(1);
-    final Union union = SetOperation.builder().buildUnion();
+    final ThetaUnion union = ThetaSetOperation.builder().buildUnion();
     final MemorySegment seg  = MemorySegment.ofArray(sketch.toByteArray());
     union.union(seg );
     assertEquals(union.getResult().getEstimate(), 1, 0);
@@ -184,11 +184,11 @@ public void unionWrapped() {
 
   @Test
   public void buildAndCompact() {
-    UpdateSketch sk1;
-    CompactSketch csk;
+    UpdatableThetaSketch sk1;
+    CompactThetaSketch csk;
     int bytes;
     //On-heap
-    sk1 = UpdateSketch.builder().setNominalEntries(32).build();
+    sk1 = UpdatableThetaSketch.builder().setNominalEntries(32).build();
     sk1.update(1);
     csk = sk1.compact(true, null);
     assertTrue(csk instanceof SingleItemSketch);
@@ -198,7 +198,7 @@ public void buildAndCompact() {
     //Off-heap
     bytes = ThetaSketch.getMaxUpdateSketchBytes(32);
     MemorySegment wseg  = MemorySegment.ofArray(new byte[bytes]);
-    sk1= UpdateSketch.builder().setNominalEntries(32).build(wseg );
+    sk1= UpdatableThetaSketch.builder().setNominalEntries(32).build(wseg );
     sk1.update(1);
     csk = sk1.compact(true, null);
     assertTrue(csk instanceof SingleItemSketch);
@@ -215,25 +215,25 @@ public void buildAndCompact() {
 
   @Test
   public void intersection() {
-    UpdateSketch sk1, sk2;
-    CompactSketch csk;
+    UpdatableThetaSketch sk1, sk2;
+    CompactThetaSketch csk;
     int bytes;
-    //Intersection on-heap
-    sk1 = UpdateSketch.builder().setNominalEntries(32).build();
-    sk2 = UpdateSketch.builder().setNominalEntries(32).build();
+    //ThetaIntersection on-heap
+    sk1 = UpdatableThetaSketch.builder().setNominalEntries(32).build();
+    sk2 = UpdatableThetaSketch.builder().setNominalEntries(32).build();
     sk1.update(1);
     sk1.update(2);
     sk2.update(1);
-    Intersection inter = SetOperation.builder().buildIntersection();
+    ThetaIntersection inter = ThetaSetOperation.builder().buildIntersection();
     inter.intersect(sk1);
     inter.intersect(sk2);
     csk = inter.getResult(true, null);
     assertTrue(csk instanceof SingleItemSketch);
 
-    //Intersection off-heap
-    bytes = SetOperation.getMaxIntersectionBytes(32);
+    //ThetaIntersection off-heap
+    bytes = ThetaSetOperation.getMaxIntersectionBytes(32);
     final MemorySegment wseg  = MemorySegment.ofArray(new byte[bytes]);
-    inter = SetOperation.builder().buildIntersection(wseg );
+    inter = ThetaSetOperation.builder().buildIntersection(wseg );
     inter.intersect(sk1);
     inter.intersect(sk2);
     csk = inter.getResult(true, null);
@@ -244,24 +244,24 @@ public void intersection() {
 
   @Test
   public void union() {
-    UpdateSketch sk1, sk2;
-    CompactSketch csk;
+    UpdatableThetaSketch sk1, sk2;
+    CompactThetaSketch csk;
     int bytes;
-    //Union on-heap
-    sk1 = UpdateSketch.builder().setNominalEntries(32).build();
-    sk2 = UpdateSketch.builder().setNominalEntries(32).build();
+    //ThetaUnion on-heap
+    sk1 = UpdatableThetaSketch.builder().setNominalEntries(32).build();
+    sk2 = UpdatableThetaSketch.builder().setNominalEntries(32).build();
     sk1.update(1);
     sk2.update(1);
-    Union union = SetOperation.builder().buildUnion();
+    ThetaUnion union = ThetaSetOperation.builder().buildUnion();
     union.union(sk1);
     union.union(sk2);
     csk = union.getResult(true, null);
     assertTrue(csk instanceof SingleItemSketch);
 
-    //Union off-heap
-    bytes = SetOperation.getMaxUnionBytes(32);
+    //ThetaUnion off-heap
+    bytes = ThetaSetOperation.getMaxUnionBytes(32);
     final MemorySegment wseg  = MemorySegment.ofArray(new byte[bytes]);
-    union = SetOperation.builder().buildUnion(wseg );
+    union = ThetaSetOperation.builder().buildUnion(wseg );
     union.union(sk1);
     union.union(sk2);
     csk = union.getResult(true, null);
@@ -272,32 +272,32 @@ public void union() {
 
   @Test
   public void aNotB() {
-    UpdateSketch sk1, sk2;
-    CompactSketch csk;
-    //AnotB on-heap
-    sk1 = UpdateSketch.builder().setNominalEntries(32).build();
-    sk2 = UpdateSketch.builder().setNominalEntries(32).build();
+    UpdatableThetaSketch sk1, sk2;
+    CompactThetaSketch csk;
+    //ThetaAnotB on-heap
+    sk1 = UpdatableThetaSketch.builder().setNominalEntries(32).build();
+    sk2 = UpdatableThetaSketch.builder().setNominalEntries(32).build();
     sk1.update(1);
     sk2.update(2);
-    final AnotB aNotB = SetOperation.builder().buildANotB();
+    final ThetaAnotB aNotB = ThetaSetOperation.builder().buildANotB();
     aNotB.setA(sk1);
     aNotB.notB(sk2);
     csk = aNotB.getResult(true, null, true);
     assertTrue(csk instanceof SingleItemSketch);
-    //not AnotB off-heap form
+    //not ThetaAnotB off-heap form
   }
 
   @Test
   public void checkHeapifyInstance() {
-    final UpdateSketch sk1 = new UpdateSketchBuilder().build();
+    final UpdatableThetaSketch sk1 = new UpdateSketchBuilder().build();
     sk1.update(1);
-    final UpdateSketch sk2 = new UpdateSketchBuilder().build();
+    final UpdatableThetaSketch sk2 = new UpdateSketchBuilder().build();
     sk2.update(1);
-    final Intersection inter = SetOperation.builder().buildIntersection();
+    final ThetaIntersection inter = ThetaSetOperation.builder().buildIntersection();
     inter.intersect(sk1);
     inter.intersect(sk2);
     final MemorySegment wseg  = MemorySegment.ofArray(new byte[16]);
-    final CompactSketch csk = inter.getResult(false, wseg );
+    final CompactThetaSketch csk = inter.getResult(false, wseg );
     assertTrue(csk.isOrdered());
     final ThetaSketch csk2 = ThetaSketch.heapify(wseg );
     assertTrue(csk2 instanceof SingleItemSketch);
@@ -307,7 +307,7 @@ public void checkHeapifyInstance() {
   @Test
   public void checkSingleItemBadFlags() {
     final short defaultSeedHash = Util.computeSeedHash(Util.DEFAULT_UPDATE_SEED);
-    final UpdateSketch sk1 = new UpdateSketchBuilder().build();
+    final UpdatableThetaSketch sk1 = new UpdateSketchBuilder().build();
     sk1.update(1);
     final MemorySegment wseg  = MemorySegment.ofArray(new byte[16]);
     sk1.compact(true, wseg );
@@ -330,13 +330,13 @@ public void checkDirectUnionSingleItem2() {
 
   @Test
   public void checkSingleItemCompact() {
-    final UpdateSketch sk1 = new UpdateSketchBuilder().build();
+    final UpdatableThetaSketch sk1 = new UpdateSketchBuilder().build();
     sk1.update(1);
-    final CompactSketch csk = sk1.compact();
+    final CompactThetaSketch csk = sk1.compact();
     assertTrue(csk instanceof SingleItemSketch);
-    final CompactSketch csk2 = csk.compact();
+    final CompactThetaSketch csk2 = csk.compact();
     assertEquals(csk, csk2);
-    final CompactSketch csk3 = csk.compact(true, MemorySegment.ofArray(new byte[16]));
+    final CompactThetaSketch csk3 = csk.compact(true, MemorySegment.ofArray(new byte[16]));
     assertTrue(csk3 instanceof DirectCompactSketch);
     assertEquals(csk2.getCurrentPreambleLongs(), 1);
     assertEquals(csk3.getCurrentPreambleLongs(), 1);
diff --git a/src/test/java/org/apache/datasketches/theta/SketchMiscTest.java b/src/test/java/org/apache/datasketches/theta/SketchMiscTest.java
index a920b8426..cc896e344 100644
--- a/src/test/java/org/apache/datasketches/theta/SketchMiscTest.java
+++ b/src/test/java/org/apache/datasketches/theta/SketchMiscTest.java
@@ -35,24 +35,24 @@
 public class SketchMiscTest {
 
   private static MemorySegment getCompactSketchMemorySegment(final int k, final int from, final int to) {
-    final UpdateSketch sk1 = UpdateSketch.builder().setNominalEntries(k).build();
+    final UpdatableThetaSketch sk1 = UpdatableThetaSketch.builder().setNominalEntries(k).build();
     for (int i=from; i tupleBldr = new UpdatableSketchBuilder<>(factory);
   private final Double constSummary = 1.0;
 
@@ -89,7 +89,7 @@ public void checkNormalReturns1() { // tuple, tuple
   @Test
   public void checkNormalReturns2() { // tuple, theta
     final UpdatableSketch skA = tupleBldr.build(); //4K
-    final UpdateSketch skC = thetaBldr.build();
+    final UpdatableThetaSketch skC = thetaBldr.build();
     final int uA = 10000;
     final int uC = 100000;
     for (int i = 0; i < uA; i++) { skA.update(i, constSummary); }
@@ -138,7 +138,7 @@ public void checkAbnormalReturns1() { // tuple, tuple
   @Test(expectedExceptions = SketchesArgumentException.class)
   public void checkAbnormalReturns2() { // tuple, theta
     final UpdatableSketch skA = tupleBldr.build(); //4K
-    final UpdateSketch skC = thetaBldr.build();
+    final UpdatableThetaSketch skC = thetaBldr.build();
     final int uA = 100000;
     final int uC = 10000;
     for (int i = 0; i < uA; i++) { skA.update(i, constSummary); }
diff --git a/src/test/java/org/apache/datasketches/tuple/JaccardSimilarityTest.java b/src/test/java/org/apache/datasketches/tuple/JaccardSimilarityTest.java
index 1553596c9..2bb2ecd3d 100644
--- a/src/test/java/org/apache/datasketches/tuple/JaccardSimilarityTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/JaccardSimilarityTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.datasketches.tuple;
 
-import org.apache.datasketches.theta.UpdateSketch;
+import org.apache.datasketches.theta.UpdatableThetaSketch;
 import org.apache.datasketches.theta.UpdateSketchBuilder;
 import org.apache.datasketches.tuple.UpdatableSketch;
 import org.apache.datasketches.tuple.UpdatableSketchBuilder;
@@ -43,7 +43,7 @@ public class JaccardSimilarityTest {
   private final DoubleSummary.Mode umode = DoubleSummary.Mode.Sum;
   private final DoubleSummarySetOperations dsso = new DoubleSummarySetOperations();
   private final DoubleSummaryFactory factory = new DoubleSummaryFactory(umode);
-  private final UpdateSketchBuilder thetaBldr = UpdateSketch.builder();
+  private final UpdateSketchBuilder thetaBldr = UpdatableThetaSketch.builder();
   private final UpdatableSketchBuilder tupleBldr = new UpdatableSketchBuilder<>(factory);
   private final Double constSummary = 1.0;
 
@@ -104,7 +104,7 @@ public void checkNullsEmpties2() { // tuple, theta
     assertFalse(state);
 
     final UpdatableSketch measured = tupleBldr.setNominalEntries(minK).build();
-    final UpdateSketch expected = thetaBldr.setNominalEntries(minK).build();
+    final UpdatableThetaSketch expected = thetaBldr.setNominalEntries(minK).build();
 
     //check both empty
     jResults = jaccard(measured, expected, factory.newSummary(), dsso);
@@ -175,7 +175,7 @@ public void checkExactMode2() { // tuple, theta
     println("Exact Mode, minK: " + k + "\t Th: " + threshold);
 
     final UpdatableSketch measured = tupleBldr.setNominalEntries(k).build();
-    final UpdateSketch expected = thetaBldr.setNominalEntries(k).build();
+    final UpdatableThetaSketch expected = thetaBldr.setNominalEntries(k).build();
 
     for (int i = 0; i < (u-1); i++) { //one short
       measured.update(i, constSummary);
@@ -249,7 +249,7 @@ public void checkEstMode2() { // tuple, theta
     println("Estimation Mode, minK: " + k + "\t Th: " + threshold);
 
     final UpdatableSketch measured = tupleBldr.setNominalEntries(k).build();
-    final UpdateSketch expected = thetaBldr.setNominalEntries(k).build();
+    final UpdatableThetaSketch expected = thetaBldr.setNominalEntries(k).build();
 
     for (int i = 0; i < u; i++) {
       measured.update(i, constSummary);
@@ -326,7 +326,7 @@ public void checkSimilarity2() { // tuple, theta
     println("Estimation Mode, minK: " + minK + "\t Th: " + threshold);
 
     final UpdatableSketch measured = tupleBldr.setNominalEntries(minK).build();
-    final UpdateSketch expected = thetaBldr.setNominalEntries(minK).build();
+    final UpdatableThetaSketch expected = thetaBldr.setNominalEntries(minK).build();
 
     for (int i = 0; i < u1; i++) {
       expected.update(i);
@@ -389,7 +389,7 @@ public void checkDissimilarity2() { // tuple, theta
     println("Estimation Mode, minK: " + minK + "\t Th: " + threshold);
 
     final UpdatableSketch measured = tupleBldr.setNominalEntries(minK).setNominalEntries(minK).build();
-    final UpdateSketch expected = thetaBldr.setNominalEntries(minK).build();
+    final UpdatableThetaSketch expected = thetaBldr.setNominalEntries(minK).build();
 
     for (int i = 0; i < u1; i++) {
       expected.update(i);
@@ -431,7 +431,7 @@ public void checkMinK1() { // tuple, tuple
   @Test
   public void checkMinK2() { // tuple, theta
     final UpdatableSketch skA = tupleBldr.build(); //4096
-    final UpdateSketch skB = UpdateSketch.builder().build(); //4096
+    final UpdatableThetaSketch skB = UpdatableThetaSketch.builder().build(); //4096
     skA.update(1, constSummary);
     skB.update(1);
     double[] result = jaccard(skA, skB, factory.newSummary(), dsso);
diff --git a/src/test/java/org/apache/datasketches/tuple/TupleExamples2Test.java b/src/test/java/org/apache/datasketches/tuple/TupleExamples2Test.java
index c26f6f394..092b1346d 100644
--- a/src/test/java/org/apache/datasketches/tuple/TupleExamples2Test.java
+++ b/src/test/java/org/apache/datasketches/tuple/TupleExamples2Test.java
@@ -21,7 +21,7 @@
 
   import static org.testng.Assert.assertEquals;
 
-import org.apache.datasketches.theta.UpdateSketch;
+import org.apache.datasketches.theta.UpdatableThetaSketch;
 import org.apache.datasketches.theta.UpdateSketchBuilder;
 import org.apache.datasketches.tuple.CompactSketch;
 import org.apache.datasketches.tuple.Intersection;
@@ -47,7 +47,7 @@ public class TupleExamples2Test {
     private final DoubleSummarySetOperations dsso2 = new DoubleSummarySetOperations(umode, imode);
     private final DoubleSummaryFactory ufactory = new DoubleSummaryFactory(umode);
     private final DoubleSummaryFactory ifactory = new DoubleSummaryFactory(imode);
-    private final UpdateSketchBuilder thetaBldr = UpdateSketch.builder();
+    private final UpdateSketchBuilder thetaBldr = UpdatableThetaSketch.builder();
     private final UpdatableSketchBuilder tupleBldr =
         new UpdatableSketchBuilder<>(ufactory);
 
@@ -56,7 +56,7 @@ public class TupleExamples2Test {
     public void example1() { // stateful: tuple, theta, use dsso2
       //Load source sketches
       final UpdatableSketch tupleSk = tupleBldr.build();
-      final UpdateSketch thetaSk = thetaBldr.build();
+      final UpdatableThetaSketch thetaSk = thetaBldr.build();
       for (int i = 1; i <= 12; i++) {
         tupleSk.update(i, 1.0);
         thetaSk.update(i + 3);
@@ -145,7 +145,7 @@ public void example2() { //stateless: tuple1, tuple2, use dsso2
     public void example3() { //stateless: tuple1, tuple2, use dsso2
       //Load source sketches
       final UpdatableSketch tupleSk = tupleBldr.build();
-      final UpdateSketch thetaSk = thetaBldr.build();
+      final UpdatableThetaSketch thetaSk = thetaBldr.build();
       for (int i = 1; i <= 12; i++) {
         tupleSk.update(i, 1.0);
         thetaSk.update(i + 3);
@@ -189,7 +189,7 @@ public void example3() { //stateless: tuple1, tuple2, use dsso2
     public void example4() { //stateful: tuple, theta, Mode=sum for both, use dsso0
       //Load source sketches
       final UpdatableSketch tupleSk = tupleBldr.build();
-      final UpdateSketch thetaSk = thetaBldr.build();
+      final UpdatableThetaSketch thetaSk = thetaBldr.build();
       for (int i = 1; i <= 12; i++) {
         tupleSk.update(i, 1.0);
         thetaSk.update(i + 3);
@@ -235,7 +235,7 @@ public void example4() { //stateful: tuple, theta, Mode=sum for both, use dsso0
     public void example5() { //stateful, tuple, theta, Mode=sum for both, use dsso1
       //Load source sketches
       final UpdatableSketch tupleSk = tupleBldr.build();
-      final UpdateSketch thetaSk = thetaBldr.build();
+      final UpdatableThetaSketch thetaSk = thetaBldr.build();
       for (int i = 1; i <= 12; i++) {
         tupleSk.update(i, 1.0);
         thetaSk.update(i + 3);
diff --git a/src/test/java/org/apache/datasketches/tuple/TupleExamplesTest.java b/src/test/java/org/apache/datasketches/tuple/TupleExamplesTest.java
index f6941e334..a08908a9d 100644
--- a/src/test/java/org/apache/datasketches/tuple/TupleExamplesTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/TupleExamplesTest.java
@@ -21,7 +21,7 @@
 
 import static org.testng.Assert.assertEquals;
 
-import org.apache.datasketches.theta.UpdateSketch;
+import org.apache.datasketches.theta.UpdatableThetaSketch;
 import org.apache.datasketches.theta.UpdateSketchBuilder;
 import org.apache.datasketches.tuple.CompactSketch;
 import org.apache.datasketches.tuple.Intersection;
@@ -45,7 +45,7 @@ public class TupleExamplesTest {
   private final IntegerSummarySetOperations isso = new IntegerSummarySetOperations(umode, imode);
   private final IntegerSummaryFactory ufactory = new IntegerSummaryFactory(umode);
   private final IntegerSummaryFactory ifactory = new IntegerSummaryFactory(imode);
-  private final UpdateSketchBuilder thetaBldr = UpdateSketch.builder();
+  private final UpdateSketchBuilder thetaBldr = UpdatableThetaSketch.builder();
   private final UpdatableSketchBuilder tupleBldr =
       new UpdatableSketchBuilder<>(ufactory);
 
@@ -54,7 +54,7 @@ public class TupleExamplesTest {
   public void example1() {
     //Load source sketches
     final UpdatableSketch tupleSk = tupleBldr.build();
-    final UpdateSketch thetaSk = thetaBldr.build();
+    final UpdatableThetaSketch thetaSk = thetaBldr.build();
     for (int i = 1; i <= 12; i++) {
       tupleSk.update(i, 1);
       thetaSk.update(i + 3);
@@ -143,7 +143,7 @@ public void example2() {
   public void example3() {
     //Load source sketches
     final UpdatableSketch tupleSk = tupleBldr.build();
-    final UpdateSketch thetaSk = thetaBldr.build();
+    final UpdatableThetaSketch thetaSk = thetaBldr.build();
     for (int i = 1; i <= 12; i++) {
       tupleSk.update(i, 1);
       thetaSk.update(i + 3);
diff --git a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleAnotBTest.java b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleAnotBTest.java
index c8b4a8135..90047237a 100644
--- a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleAnotBTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleAnotBTest.java
@@ -24,7 +24,7 @@
 import static org.testng.Assert.fail;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.theta.UpdateSketch;
+import org.apache.datasketches.theta.UpdatableThetaSketch;
 import org.apache.datasketches.theta.UpdateSketchBuilder;
 import org.apache.datasketches.tuple.AnotB;
 import org.apache.datasketches.tuple.CompactSketch;
@@ -154,7 +154,7 @@ private static UpdatableSketch buildUpdatableTuple() {
     return new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
   }
 
-  private static UpdateSketch buildUpdateTheta() {
+  private static UpdatableThetaSketch buildUpdateTheta() {
     return new UpdateSketchBuilder().build();
   }
 
@@ -168,7 +168,7 @@ public void aNotBNullEmptyCombinations() {
     results.set(0, true, 0.0, 0.0, 0.0).check(result);
 
     final UpdatableSketch sketch = buildUpdatableTuple();
-    final UpdateSketch skTheta = buildUpdateTheta();
+    final UpdatableThetaSketch skTheta = buildUpdateTheta();
 
     threeMethodsWithTheta(aNotB, null, null, null, results);
     threeMethodsWithTheta(aNotB, sketch, null, null, results);
@@ -199,7 +199,7 @@ public void aNotBEmptyExact() {
     final UpdatableSketch sketchB = buildUpdatableTuple();
     sketchB.update(1, 1.0);
     sketchB.update(2, 1.0);
-    final UpdateSketch skThetaB = buildUpdateTheta();
+    final UpdatableThetaSketch skThetaB = buildUpdateTheta();
     skThetaB.update(1);
     skThetaB.update(2);
 
@@ -214,7 +214,7 @@ public void aNotBExactEmpty() {
     sketchA.update(1, 1.0);
     sketchA.update(2, 1.0);
     final UpdatableSketch sketchB = buildUpdatableTuple();
-    final UpdateSketch skThetaB = buildUpdateTheta();
+    final UpdatableThetaSketch skThetaB = buildUpdateTheta();
 
     final AnotB aNotB = new AnotB<>();
     results.set(2, false, 2.0, 0.0, 1.0);
@@ -238,7 +238,7 @@ public void aNotBExactOverlap() {
     sketchB.update(3, 1.0);
     sketchB.update(3, 1.0);
 
-    final UpdateSketch skThetaB = buildUpdateTheta();
+    final UpdatableThetaSketch skThetaB = buildUpdateTheta();
     skThetaB.update(2);
     skThetaB.update(3);
 
@@ -259,7 +259,7 @@ public void aNotBEstimationOverlap() {
       sketchB.update(i, 1.0);
     }
 
-    final UpdateSketch skThetaB = buildUpdateTheta();
+    final UpdatableThetaSketch skThetaB = buildUpdateTheta();
     for (int i = 0; i < 4096; i++) {
       skThetaB.update(i);
     }
@@ -284,7 +284,7 @@ public void aNotBEstimationOverlapLargeB() {
       sketchB.update(i + 8000, 1.0);
     }
 
-    final UpdateSketch skThetaB = buildUpdateTheta();
+    final UpdatableThetaSketch skThetaB = buildUpdateTheta();
     for (int i = 0; i < 100_000; i++) {
       skThetaB.update(i + 8000);
     }
diff --git a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleIntersectionTest.java b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleIntersectionTest.java
index b7ee014d6..acf8036e4 100644
--- a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleIntersectionTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleIntersectionTest.java
@@ -23,7 +23,7 @@
 
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.SketchesStateException;
-import org.apache.datasketches.theta.UpdateSketch;
+import org.apache.datasketches.theta.UpdatableThetaSketch;
 import org.apache.datasketches.theta.UpdateSketchBuilder;
 import org.apache.datasketches.tuple.CompactSketch;
 import org.apache.datasketches.tuple.Intersection;
@@ -193,10 +193,10 @@ public void intersectionEstimationMode() {
 
   @Test
   public void checkExactIntersectionWithTheta() {
-    final UpdateSketch thSkNull = null;
-    final UpdateSketch thSkEmpty = new UpdateSketchBuilder().build();
-    final UpdateSketch thSk10 = new UpdateSketchBuilder().build();
-    final UpdateSketch thSk15 = new UpdateSketchBuilder().build();
+    final UpdatableThetaSketch thSkNull = null;
+    final UpdatableThetaSketch thSkEmpty = new UpdateSketchBuilder().build();
+    final UpdatableThetaSketch thSk10 = new UpdateSketchBuilder().build();
+    final UpdatableThetaSketch thSk15 = new UpdateSketchBuilder().build();
     for (int i = 0; i < 10; i++) { thSk10.update(i); }
     for (int i = 0; i < 10; i++) { thSk15.update(i + 5); } //overlap = 5
 
@@ -240,8 +240,8 @@ public void checkExactIntersectionWithTheta() {
 
   @Test
   public void checkExactIntersectionWithThetaDisjoint() {
-    final UpdateSketch thSkA = new UpdateSketchBuilder().setLogNominalEntries(10).build();
-    final UpdateSketch thSkB = new UpdateSketchBuilder().setLogNominalEntries(10).build();
+    final UpdatableThetaSketch thSkA = new UpdateSketchBuilder().setLogNominalEntries(10).build();
+    final UpdatableThetaSketch thSkB = new UpdateSketchBuilder().setLogNominalEntries(10).build();
     int key = 0;
     for (int i = 0; i < 32;  i++) { thSkA.update(key++); }
     for (int i = 0; i < 32; i++) { thSkB.update(key++); }
@@ -265,8 +265,8 @@ public void checkExactIntersectionWithThetaDisjoint() {
 
   @Test
   public void checkEstimatingIntersectionWithThetaOverlapping() {
-    final UpdateSketch thSkA = new UpdateSketchBuilder().setLogNominalEntries(4).build();
-    final UpdateSketch thSkB = new UpdateSketchBuilder().setLogNominalEntries(10).build();
+    final UpdatableThetaSketch thSkA = new UpdateSketchBuilder().setLogNominalEntries(4).build();
+    final UpdatableThetaSketch thSkB = new UpdateSketchBuilder().setLogNominalEntries(10).build();
     for (int i = 0; i < 64;  i++) { thSkA.update(i); } //dense mode, low theta
     for (int i = 32; i < 96; i++) { thSkB.update(i); } //exact overlapping
 
diff --git a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleUnionTest.java b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleUnionTest.java
index c9a3d5887..94272df54 100644
--- a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleUnionTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleUnionTest.java
@@ -22,7 +22,7 @@
 import static org.testng.Assert.fail;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.theta.UpdateSketch;
+import org.apache.datasketches.theta.UpdatableThetaSketch;
 import org.apache.datasketches.theta.UpdateSketchBuilder;
 import org.apache.datasketches.tuple.CompactSketch;
 import org.apache.datasketches.tuple.TupleSketchIterator;
@@ -157,7 +157,7 @@ public void unionMixedMode() {
   @Test
   public void checkUnionUpdateWithTheta() {
     final Union union = new Union<>(new DoubleSummarySetOperations(mode, mode));
-    UpdateSketch usk = null;
+    UpdatableThetaSketch usk = null;
     DoubleSummary dsum = null;
 
     try { union.union(usk, dsum); fail(); }
diff --git a/src/test/java/org/apache/datasketches/tuple/aninteger/CornerCaseTupleSetOperationsTest.java b/src/test/java/org/apache/datasketches/tuple/aninteger/CornerCaseTupleSetOperationsTest.java
index 0df275001..6fd6a28cc 100644
--- a/src/test/java/org/apache/datasketches/tuple/aninteger/CornerCaseTupleSetOperationsTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/aninteger/CornerCaseTupleSetOperationsTest.java
@@ -24,7 +24,7 @@
 
 import org.apache.datasketches.common.ResizeFactor;
 import org.apache.datasketches.common.Util;
-import org.apache.datasketches.theta.UpdateSketch;
+import org.apache.datasketches.theta.UpdatableThetaSketch;
 import org.apache.datasketches.theta.UpdateSketchBuilder;
 import org.apache.datasketches.tuple.AnotB;
 import org.apache.datasketches.tuple.CompactSketch;
@@ -76,7 +76,7 @@ private enum SkType {
   public void emptyEmpty() {
     IntegerSketch tupleA = getTupleSketch(SkType.EMPTY, 0, 0);
     IntegerSketch tupleB = getTupleSketch(SkType.EMPTY, 0, 0);
-    UpdateSketch thetaB =  getThetaSketch(SkType.EMPTY, 0, 0);
+    UpdatableThetaSketch thetaB =  getThetaSketch(SkType.EMPTY, 0, 0);
     final double expectedIntersectTheta = 1.0;
     final int expectedIntersectCount = 0;
     final boolean expectedIntersectEmpty = true;
@@ -97,7 +97,7 @@ public void emptyEmpty() {
   public void emptyExact() {
     IntegerSketch tupleA = getTupleSketch(SkType.EMPTY, 0, 0);
     IntegerSketch tupleB = getTupleSketch(SkType.EXACT, 0, GT_MIDP_V);
-    UpdateSketch thetaB =  getThetaSketch(SkType.EXACT, 0, GT_MIDP_V);
+    UpdatableThetaSketch thetaB =  getThetaSketch(SkType.EXACT, 0, GT_MIDP_V);
     final double expectedIntersectTheta = 1.0;
     final int expectedIntersectCount = 0;
     final boolean expectedIntersectEmpty = true;
@@ -118,7 +118,7 @@ public void emptyExact() {
   public void EmptyDegenerate() {
     IntegerSketch tupleA = getTupleSketch(SkType.EMPTY, 0, 0);
     IntegerSketch tupleB = getTupleSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
-    UpdateSketch thetaB =  getThetaSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
+    UpdatableThetaSketch thetaB =  getThetaSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
     final double expectedIntersectTheta = 1.0;
     final int expectedIntersectCount = 0;
     final boolean expectedIntersectEmpty = true;
@@ -139,7 +139,7 @@ public void EmptyDegenerate() {
   public void emptyEstimation() {
     IntegerSketch tupleA = getTupleSketch(SkType.EMPTY, 0, 0);
     IntegerSketch tupleB = getTupleSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
-    UpdateSketch thetaB =  getThetaSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
+    UpdatableThetaSketch thetaB =  getThetaSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
     final double expectedIntersectTheta = 1.0;
     final int expectedIntersectCount = 0;
     final boolean expectedIntersectEmpty = true;
@@ -162,7 +162,7 @@ public void emptyEstimation() {
   public void exactEmpty() {
     IntegerSketch tupleA = getTupleSketch(SkType.EXACT, 0, GT_MIDP_V);
     IntegerSketch tupleB = getTupleSketch(SkType.EMPTY, 0, 0);
-    UpdateSketch thetaB =  getThetaSketch(SkType.EMPTY, 0, 0);
+    UpdatableThetaSketch thetaB =  getThetaSketch(SkType.EMPTY, 0, 0);
     final double expectedIntersectTheta = 1.0;
     final int expectedIntersectCount = 0;
     final boolean expectedIntersectEmpty = true;
@@ -183,7 +183,7 @@ public void exactEmpty() {
   public void exactExact() {
     IntegerSketch tupleA = getTupleSketch(SkType.EXACT, 0, GT_MIDP_V);
     IntegerSketch tupleB = getTupleSketch(SkType.EXACT, 0, GT_MIDP_V);
-    UpdateSketch thetaB =  getThetaSketch(SkType.EXACT, 0, GT_MIDP_V);
+    UpdatableThetaSketch thetaB =  getThetaSketch(SkType.EXACT, 0, GT_MIDP_V);
     final double expectedIntersectTheta = 1.0;
     final int expectedIntersectCount = 1;
     final boolean expectedIntersectEmpty = false;
@@ -204,7 +204,7 @@ public void exactExact() {
   public void exactDegenerate() {
     IntegerSketch tupleA = getTupleSketch(SkType.EXACT, 0, LT_LOWP_V);
     IntegerSketch tupleB = getTupleSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V); //entries = 0
-    UpdateSketch thetaB =  getThetaSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
+    UpdatableThetaSketch thetaB =  getThetaSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
     final double expectedIntersectTheta = LOWP_FLT;
     final int expectedIntersectCount = 0;
     final boolean expectedIntersectEmpty = false;
@@ -225,7 +225,7 @@ public void exactDegenerate() {
   public void exactEstimation() {
     IntegerSketch tupleA = getTupleSketch(SkType.EXACT, 0, LT_LOWP_V);
     IntegerSketch tupleB = getTupleSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
-    UpdateSketch thetaB =  getThetaSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
+    UpdatableThetaSketch thetaB =  getThetaSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
     final double expectedIntersectTheta = LOWP_FLT;
     final int expectedIntersectCount = 1;
     final boolean expectedIntersectEmpty = false;
@@ -248,7 +248,7 @@ public void exactEstimation() {
   public void estimationEmpty() {
     IntegerSketch tupleA = getTupleSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
     IntegerSketch tupleB = getTupleSketch(SkType.EMPTY, 0, 0);
-    UpdateSketch thetaB =  getThetaSketch(SkType.EMPTY, 0, 0);
+    UpdatableThetaSketch thetaB =  getThetaSketch(SkType.EMPTY, 0, 0);
     final double expectedIntersectTheta = 1.0;
     final int expectedIntersectCount = 0;
     final boolean expectedIntersectEmpty = true;
@@ -269,7 +269,7 @@ public void estimationEmpty() {
   public void estimationExact() {
     IntegerSketch tupleA = getTupleSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
     IntegerSketch tupleB = getTupleSketch(SkType.EXACT, 0, LT_LOWP_V);
-    UpdateSketch thetaB =  getThetaSketch(SkType.EXACT, 0, LT_LOWP_V);
+    UpdatableThetaSketch thetaB =  getThetaSketch(SkType.EXACT, 0, LT_LOWP_V);
     final double expectedIntersectTheta = LOWP_FLT;
     final int expectedIntersectCount = 1;
     final boolean expectedIntersectEmpty = false;
@@ -290,7 +290,7 @@ public void estimationExact() {
   public void estimationDegenerate() {
     IntegerSketch tupleA = getTupleSketch(SkType.ESTIMATION, MIDP_FLT, LT_LOWP_V);
     IntegerSketch tupleB = getTupleSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
-    UpdateSketch thetaB =  getThetaSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
+    UpdatableThetaSketch thetaB =  getThetaSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
     final double expectedIntersectTheta = LOWP_FLT;
     final int expectedIntersectCount = 0;
     final boolean expectedIntersectEmpty = false;
@@ -311,7 +311,7 @@ public void estimationDegenerate() {
   public void estimationEstimation() {
     IntegerSketch tupleA = getTupleSketch(SkType.ESTIMATION, MIDP_FLT, LT_LOWP_V);
     IntegerSketch tupleB = getTupleSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
-    UpdateSketch thetaB =  getThetaSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
+    UpdatableThetaSketch thetaB =  getThetaSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
     final double expectedIntersectTheta = LOWP_FLT;
     final int expectedIntersectCount = 1;
     final boolean expectedIntersectEmpty = false;
@@ -334,7 +334,7 @@ public void estimationEstimation() {
   public void degenerateEmpty() {
     IntegerSketch tupleA = getTupleSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V); //entries = 0
     IntegerSketch tupleB = getTupleSketch(SkType.EMPTY, 0, 0);
-    UpdateSketch thetaB =  getThetaSketch(SkType.EMPTY, 0, 0);
+    UpdatableThetaSketch thetaB =  getThetaSketch(SkType.EMPTY, 0, 0);
     final double expectedIntersectTheta = 1.0;
     final int expectedIntersectCount = 0;
     final boolean expectedIntersectEmpty = true;
@@ -355,7 +355,7 @@ public void degenerateEmpty() {
   public void degenerateExact() {
     IntegerSketch tupleA = getTupleSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V); //entries = 0
     IntegerSketch tupleB = getTupleSketch(SkType.EXACT, 0, LT_LOWP_V);
-    UpdateSketch thetaB =  getThetaSketch(SkType.EXACT, 0, LT_LOWP_V);
+    UpdatableThetaSketch thetaB =  getThetaSketch(SkType.EXACT, 0, LT_LOWP_V);
     final double expectedIntersectTheta = LOWP_FLT;
     final int expectedIntersectCount = 0;
     final boolean expectedIntersectEmpty = false;
@@ -376,7 +376,7 @@ public void degenerateExact() {
   public void degenerateDegenerate() {
     IntegerSketch tupleA = getTupleSketch(SkType.DEGENERATE, MIDP_FLT, GT_MIDP_V); //entries = 0
     IntegerSketch tupleB = getTupleSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
-    UpdateSketch thetaB =  getThetaSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
+    UpdatableThetaSketch thetaB =  getThetaSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
     final double expectedIntersectTheta = LOWP_FLT;
     final int expectedIntersectCount = 0;
     final boolean expectedIntersectEmpty = false;
@@ -397,7 +397,7 @@ public void degenerateDegenerate() {
   public void degenerateEstimation() {
     IntegerSketch tupleA = getTupleSketch(SkType.DEGENERATE, MIDP_FLT, GT_MIDP_V); //entries = 0
     IntegerSketch tupleB = getTupleSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
-    UpdateSketch thetaB =  getThetaSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
+    UpdatableThetaSketch thetaB =  getThetaSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
     final double expectedIntersectTheta = LOWP_FLT;
     final int expectedIntersectCount = 0;
     final boolean expectedIntersectEmpty = false;
@@ -420,7 +420,7 @@ public void degenerateEstimation() {
   private void checks(
       IntegerSketch tupleA,
       IntegerSketch tupleB,
-      UpdateSketch  thetaB,
+      UpdatableThetaSketch  thetaB,
       double expectedIntersectTheta,
       int expectedIntersectCount,
       boolean expectedIntersectEmpty,
@@ -580,7 +580,7 @@ private static IntegerSketch getTupleSketch(
   }
 
   //NOTE: p and value arguments are used for every case
-  private static UpdateSketch getThetaSketch(
+  private static UpdatableThetaSketch getThetaSketch(
       SkType skType,
       float p,
       long updateKey) {
@@ -588,7 +588,7 @@ private static UpdateSketch getThetaSketch(
     bldr.setLogNominalEntries(4);
     bldr.setResizeFactor(ResizeFactor.X4);
 
-    UpdateSketch sk;
+    UpdatableThetaSketch sk;
     switch(skType) {
       case EMPTY: { // { 1.0,  0, T} p and value are not used
         sk = bldr.build();

From 2821333d8a1b88d2952bf756d5f3945ddec2edd6 Mon Sep 17 00:00:00 2001
From: Lee Rhodes 
Date: Fri, 10 Oct 2025 13:25:14 -0700
Subject: [PATCH 4/7] Fix some issues raised by Copilot

---
 .../datasketches/theta/CompactOperations.java |  1 +
 .../theta/DirectIntersectionTest.java         |  3 ---
 .../theta/HeapAlphaSketchTest.java            |  3 +--
 .../datasketches/theta/UpdateSketchTest.java  | 21 ++++++++-----------
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/apache/datasketches/theta/CompactOperations.java b/src/main/java/org/apache/datasketches/theta/CompactOperations.java
index fe7b6b60c..46d2d7e7e 100644
--- a/src/main/java/org/apache/datasketches/theta/CompactOperations.java
+++ b/src/main/java/org/apache/datasketches/theta/CompactOperations.java
@@ -113,6 +113,7 @@ static CompactThetaSketch componentsToCompact( //No error checking
    * @param srcSeg the given input source MemorySegment image. Can be Read Only.
    * @param dstOrdered the desired ordering of the resulting CompactThetaSketch
    * @param dstWSeg Used for the target CompactThetaSketch if it is MemorySegment-based. Must be Writable.
+   * If null, return on-heap.
    * @return a CompactThetaSketch of the correct form.
    */
   @SuppressWarnings("unused")
diff --git a/src/test/java/org/apache/datasketches/theta/DirectIntersectionTest.java b/src/test/java/org/apache/datasketches/theta/DirectIntersectionTest.java
index d1f923089..34403c1d8 100644
--- a/src/test/java/org/apache/datasketches/theta/DirectIntersectionTest.java
+++ b/src/test/java/org/apache/datasketches/theta/DirectIntersectionTest.java
@@ -369,15 +369,12 @@ public void checkEstimatingIntersect() {
     println("Est: "+est);
   }
 
-  @SuppressWarnings("unused")
   @Test(expectedExceptions = SketchesArgumentException.class)
   public void checkOverflow() {
     final int lgK = 9; //512
     final int k = 1<
Date: Tue, 14 Oct 2025 16:36:54 -0700
Subject: [PATCH 5/7] This set of changes completes the name changes for
 /theta/ and /tuple/.

Note that I focused on changing the name of public classes where they
might conflict with similarly named classes in other families,
particularly the /theta/ and /tuple/ families.
---
 .../apache/datasketches/common/Family.java    |  20 +-
 .../apache/datasketches/fdt/FdtSketch.java    |   4 +-
 .../datasketches/theta/ThetaSketch.java       |   2 +-
 .../theta/UpdatableThetaSketch.java           |   4 +-
 ....java => UpdatableThetaSketchBuilder.java} |  28 +--
 .../BoundsOnRatiosInTupleSketchedSets.java    |  20 +-
 ...actSketch.java => CompactTupleSketch.java} |  28 +--
 .../org/apache/datasketches/tuple/Filter.java |  20 +-
 .../apache/datasketches/tuple/HashTables.java |  18 +-
 .../datasketches/tuple/JaccardSimilarity.java | 111 +++++-----
 .../datasketches/tuple/QuickSelectSketch.java |  22 +-
 .../tuple/SerializerDeserializer.java         |   4 +-
 .../apache/datasketches/tuple/Sketches.java   |  72 -------
 .../tuple/{AnotB.java => TupleAnotB.java}     | 154 +++++++-------
 ...tersection.java => TupleIntersection.java} |  71 ++++---
 .../tuple/{Sketch.java => TupleSketch.java}   |  73 +++++--
 .../tuple/{Union.java => TupleUnion.java}     |  46 ++--
 ...eSketch.java => UpdatableTupleSketch.java} |  22 +-
 ....java => UpdatableTupleSketchBuilder.java} |  28 +--
 .../adouble/DoubleSummarySetOperations.java   |   2 +-
 ...ubleSketch.java => DoubleTupleSketch.java} |  18 +-
 .../IntegerSummarySetOperations.java          |   2 +-
 ...gerSketch.java => IntegerTupleSketch.java} |  18 +-
 .../ArrayOfDoublesAnotBImpl.java              |   4 +-
 .../ArrayOfDoublesCompactSketch.java          |   8 +-
 .../ArrayOfDoublesIntersection.java           |   8 +-
 .../arrayofdoubles/ArrayOfDoublesSketch.java  | 126 ++++++++++-
 .../ArrayOfDoublesSketches.java               | 151 --------------
 .../arrayofdoubles/ArrayOfDoublesUnion.java   |  12 +-
 .../ArrayOfDoublesUpdatableSketch.java        |   6 +-
 .../ArrayOfDoublesUpdatableSketchBuilder.java |   2 +-
 .../DirectArrayOfDoublesCompactSketch.java    |   2 +-
 .../DirectArrayOfDoublesIntersection.java     |   2 +-
 .../DirectArrayOfDoublesUnion.java            |   2 +-
 .../HeapArrayOfDoublesCompactSketch.java      |   2 +-
 .../HeapArrayOfDoublesQuickSelectSketch.java  |   2 +-
 .../HeapArrayOfDoublesUnion.java              |   2 +-
 ...ch.java => ArrayOfStringsTupleSketch.java} |  26 +--
 ...ConcurrentDirectQuickSelectSketchTest.java |   4 +-
 .../ConcurrentHeapQuickSelectSketchTest.java  |   4 +-
 .../CornerCaseThetaSetOperationsTest.java     |   2 +-
 .../datasketches/theta/ExamplesTest.java      |   2 +-
 .../theta/SingleItemSketchTest.java           |   8 +-
 .../datasketches/theta/UnionImplTest.java     |   2 +-
 .../datasketches/theta/UpdateSketchTest.java  |   4 +-
 ...BoundsOnRatiosInTupleSketchedSetsTest.java |  34 +--
 .../CompactSketchWithDoubleSummaryTest.java   |  57 +++--
 .../tuple/JaccardSimilarityTest.java          |  46 ++--
 .../apache/datasketches/tuple/MiscTest.java   |  18 +-
 .../tuple/ReadOnlyMemorySegmentTest.java      |   9 +-
 .../tuple/SerializerDeserializerTest.java     |   4 +-
 .../tuple/TupleCrossLanguageTest.java         |  27 ++-
 .../tuple/TupleExamples2Test.java             | 108 +++++-----
 .../datasketches/tuple/TupleExamplesTest.java |  72 +++----
 .../tuple/adouble/AdoubleAnotBTest.java       |  83 ++++----
 .../adouble/AdoubleIntersectionTest.java      | 119 ++++++-----
 .../tuple/adouble/AdoubleTest.java            |  83 ++++----
 .../tuple/adouble/AdoubleUnionTest.java       |  58 +++---
 .../tuple/adouble/FilterTest.java             |  39 ++--
 .../CornerCaseTupleSetOperationsTest.java     | 197 +++++++++---------
 .../tuple/aninteger/EngagementTest.java       |  18 +-
 .../tuple/aninteger/IntegerSketchTest.java    |  37 ++--
 .../tuple/aninteger/MikhailsBugTupleTest.java |  39 ++--
 .../tuple/aninteger/ParameterLeakageTest.java |  63 +++---
 .../ArrayOfDoublesUnionTest.java              |   9 +-
 ...erCaseArrayOfDoublesSetOperationsTest.java |  34 ++-
 ...DirectArrayOfDoublesCompactSketchTest.java |   7 +-
 .../HeapArrayOfDoublesCompactSketchTest.java  |  11 +-
 .../strings/ArrayOfStringsSketchTest.java     |  30 +--
 69 files changed, 1140 insertions(+), 1230 deletions(-)
 rename src/main/java/org/apache/datasketches/theta/{UpdateSketchBuilder.java => UpdatableThetaSketchBuilder.java} (94%)
 rename src/main/java/org/apache/datasketches/tuple/{CompactSketch.java => CompactTupleSketch.java} (89%)
 delete mode 100644 src/main/java/org/apache/datasketches/tuple/Sketches.java
 rename src/main/java/org/apache/datasketches/tuple/{AnotB.java => TupleAnotB.java} (81%)
 rename src/main/java/org/apache/datasketches/tuple/{Intersection.java => TupleIntersection.java} (76%)
 rename src/main/java/org/apache/datasketches/tuple/{Sketch.java => TupleSketch.java} (73%)
 rename src/main/java/org/apache/datasketches/tuple/{Union.java => TupleUnion.java} (83%)
 rename src/main/java/org/apache/datasketches/tuple/{UpdatableSketch.java => UpdatableTupleSketch.java} (90%)
 rename src/main/java/org/apache/datasketches/tuple/{UpdatableSketchBuilder.java => UpdatableTupleSketchBuilder.java} (75%)
 rename src/main/java/org/apache/datasketches/tuple/adouble/{DoubleSketch.java => DoubleTupleSketch.java} (79%)
 rename src/main/java/org/apache/datasketches/tuple/aninteger/{IntegerSketch.java => IntegerTupleSketch.java} (79%)
 delete mode 100644 src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesSketches.java
 rename src/main/java/org/apache/datasketches/tuple/strings/{ArrayOfStringsSketch.java => ArrayOfStringsTupleSketch.java} (77%)

diff --git a/src/main/java/org/apache/datasketches/common/Family.java b/src/main/java/org/apache/datasketches/common/Family.java
index 51ca822e2..032373685 100644
--- a/src/main/java/org/apache/datasketches/common/Family.java
+++ b/src/main/java/org/apache/datasketches/common/Family.java
@@ -41,12 +41,12 @@ public enum Family {
    * 30% improvement (~1/sqrt(2*k)) in its error distribution as compared to the QuickSelect
    * (or similar KMV-derived) sketches.
    *
-   * 
If the AlphaSketch is fed into any SetOperation, the error distribution reverts back to the
+   * 
If the AlphaSketch is fed into any ThetaSetOperation, the error distribution reverts back to the
    * normal QuickSelect/KMV error distribution (~1/sqrt(k)).  For this reason, the AlphaSketch
-   * does not have a sister class for off-heap operation. The Alpha Sketch has a roughly 30% faster
+   * does not have a sister class for off-heap operation. The AlphaSketch has a roughly 30% faster
    * overall update time as compared to the QuickSelect sketch family.

    *
-   * 
The Alpha Sketch is created using the UpdateSketch.builder().
+   * 
The AlphaSketch is created using the UpdatableThetaSketchBuilder().
    * See Alpha TCF and
    * Theta Sketch Framework
    */
@@ -56,35 +56,35 @@ public enum Family {
    * The QuickSelect Sketch family is a member of the Theta Sketch Framework of sketches and
    * is the workhorse of the Theta Sketch Families and can be constructed for either on-heap or
    * off-heap operation.
-   * The QuickSelect Sketch is created using the UpdateSketch.builder().
+   * The QuickSelect Sketch is created using the UpdatableThetaSketchBuilder().
    * See Quick Select TCF
    */
   QUICKSELECT(2, "QuickSelect", 3, 3),
 
   /**
    * The Compact Sketch family is a member of the Theta Sketch Framework of sketches.
-   * The are read-only and cannot be updated, but can participate in any of the Set Operations.
-   * The compact sketches are never created directly with a constructor or Builder.
+   * They are read-only and cannot be updated, but can participate in any of the Set Operations.
+   * The compact sketches are never created directly with a constructor or builder.
    * Instead they are created as a result of the compact()
-   * method of an UpdateSketch or as a result of a getSketchSamples() of a SetOperation.
+   * method of an UpdatableThetaSketch or as a result of a getSketchSamples() of a ThetaSetOperation.
    */
   COMPACT(3, "Compact", 1, 3),
 
   /**
    * The Union family is an operation for the Theta Sketch Framework of sketches.
-   * The Union is constructed using the SetOperation.builder().
+   * The Union is constructed using the ThetaSetOperationBuilder().
    */
   UNION(4, "Union", 4, 4),
 
   /**
    * The Intersection family is an operation for the Theta Sketch Framework of sketches.
-   * The Intersection is constructed using the SetOperation.builder().
+   * The ThetaIntersection is constructed using the ThetaSetOperationBuilder().
    */
   INTERSECTION(5, "Intersection", 3, 3),
 
   /**
    * The A and not B family is an operation for the Theta Sketch Framework of sketches.
-   * The AnotB operation is constructed using the SetOperation.builder().
+   * The ThetaAnotB operation is constructed using the ThetaSetOperationBuilder().
    */
   A_NOT_B(6, "AnotB", 3, 3),
 
diff --git a/src/main/java/org/apache/datasketches/fdt/FdtSketch.java b/src/main/java/org/apache/datasketches/fdt/FdtSketch.java
index 9dc6aecca..fb9f5c752 100644
--- a/src/main/java/org/apache/datasketches/fdt/FdtSketch.java
+++ b/src/main/java/org/apache/datasketches/fdt/FdtSketch.java
@@ -24,7 +24,7 @@
 
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.thetacommon.ThetaUtil;
-import org.apache.datasketches.tuple.strings.ArrayOfStringsSketch;
+import org.apache.datasketches.tuple.strings.ArrayOfStringsTupleSketch;
 
 /**
  * A Frequent Distinct Tuples sketch.
@@ -46,7 +46,7 @@
  *
  * @author Lee Rhodes
  */
-public final class FdtSketch extends ArrayOfStringsSketch {
+public final class FdtSketch extends ArrayOfStringsTupleSketch {
 
   /**
    * Create new instance of Frequent Distinct Tuples sketch with the given
diff --git a/src/main/java/org/apache/datasketches/theta/ThetaSketch.java b/src/main/java/org/apache/datasketches/theta/ThetaSketch.java
index 7ce965084..1b82ec76b 100644
--- a/src/main/java/org/apache/datasketches/theta/ThetaSketch.java
+++ b/src/main/java/org/apache/datasketches/theta/ThetaSketch.java
@@ -45,7 +45,7 @@
 
 /**
  * The top-level class for all theta sketches. This class is never constructed directly.
- * Use the UpdatableThetaSketch.builder() methods to create UpdatableThetaSketches.
+ * Use the UpdatableThetaSketchBuilder() methods to create UpdatableThetaSketches.
  *
  * @author Lee Rhodes
  */
diff --git a/src/main/java/org/apache/datasketches/theta/UpdatableThetaSketch.java b/src/main/java/org/apache/datasketches/theta/UpdatableThetaSketch.java
index a3f511f33..8b75c7883 100644
--- a/src/main/java/org/apache/datasketches/theta/UpdatableThetaSketch.java
+++ b/src/main/java/org/apache/datasketches/theta/UpdatableThetaSketch.java
@@ -212,8 +212,8 @@ public boolean isSameResource(final MemorySegment that) {
    * Returns a new builder
    * @return a new builder
    */
-  public static final UpdateSketchBuilder builder() {
-    return new UpdateSketchBuilder();
+  public static final UpdatableThetaSketchBuilder builder() {
+    return new UpdatableThetaSketchBuilder();
   }
 
   /**
diff --git a/src/main/java/org/apache/datasketches/theta/UpdateSketchBuilder.java b/src/main/java/org/apache/datasketches/theta/UpdatableThetaSketchBuilder.java
similarity index 94%
rename from src/main/java/org/apache/datasketches/theta/UpdateSketchBuilder.java
rename to src/main/java/org/apache/datasketches/theta/UpdatableThetaSketchBuilder.java
index e607e6d9d..1493c1209 100644
--- a/src/main/java/org/apache/datasketches/theta/UpdateSketchBuilder.java
+++ b/src/main/java/org/apache/datasketches/theta/UpdatableThetaSketchBuilder.java
@@ -39,7 +39,7 @@
  *
  * @author Lee Rhodes
  */
-public final class UpdateSketchBuilder {
+public final class UpdatableThetaSketchBuilder {
   private int bLgNomLongs;
   private long bSeed;
   private ResizeFactor bRF;
@@ -75,7 +75,7 @@ public final class UpdateSketchBuilder {
    * 
  • Concurrent MaxNumLocalThreads: 1
    • 
    * 
    */
-  public UpdateSketchBuilder() {
+  public UpdatableThetaSketchBuilder() {
     bLgNomLongs = Integer.numberOfTrailingZeros(ThetaUtil.DEFAULT_NOMINAL_ENTRIES);
     bSeed = Util.DEFAULT_UPDATE_SEED;
     bRF = ResizeFactor.X8;
@@ -102,7 +102,7 @@ public UpdateSketchBuilder() {
    * This will become the ceiling power of 2 if the given value is not.
    * @return this UpdatableThetaSketchBuilder
    */
-  public UpdateSketchBuilder setNominalEntries(final int nomEntries) {
+  public UpdatableThetaSketchBuilder setNominalEntries(final int nomEntries) {
     bLgNomLongs = ThetaUtil.checkNomLongs(nomEntries);
     return this;
   }
@@ -117,7 +117,7 @@ public UpdateSketchBuilder setNominalEntries(final int nomEntries) {
    * @param lgNomEntries the Log Nominal Entries. Also for the concurrent shared sketch
    * @return this UpdatableThetaSketchBuilder
    */
-  public UpdateSketchBuilder setLogNominalEntries(final int lgNomEntries) {
+  public UpdatableThetaSketchBuilder setLogNominalEntries(final int lgNomEntries) {
     bLgNomLongs = ThetaUtil.checkNomLongs(1 << lgNomEntries);
     return this;
   }
@@ -132,7 +132,7 @@ public UpdateSketchBuilder setLogNominalEntries(final int lgNomEntries) {
    * @param lgK the Log Nominal Entries. Also for the concurrent shared sketch.
    * @return this UpdatableThetaSketchBuilder
    */
-  public UpdateSketchBuilder setLgK(final int lgK) {
+  public UpdatableThetaSketchBuilder setLgK(final int lgK) {
     bLgNomLongs = ThetaUtil.checkNomLongs(1 << lgK);
     return this;
   }
@@ -155,7 +155,7 @@ public int getLgNominalEntries() {
    *                   This will become the ceiling power of 2 if it is not.
    * @return this UpdatableThetaSketchBuilder
    */
-  public UpdateSketchBuilder setConCurNominalEntries(final int nomEntries) {
+  public UpdatableThetaSketchBuilder setConCurNominalEntries(final int nomEntries) {
     bConCurLgNomLongs = Integer.numberOfTrailingZeros(ceilingPowerOf2(nomEntries));
     if (bConCurLgNomLongs > ThetaUtil.MAX_LG_NOM_LONGS || bConCurLgNomLongs < ThetaUtil.MIN_LG_NOM_LONGS) {
       throw new SketchesArgumentException(
@@ -173,7 +173,7 @@ public UpdateSketchBuilder setConCurNominalEntries(final int nomEntries) {
    * @param lgNomEntries the Log Nominal Entries for a concurrent local sketch
    * @return this UpdatableThetaSketchBuilder
    */
-  public UpdateSketchBuilder setConCurLogNominalEntries(final int lgNomEntries) {
+  public UpdatableThetaSketchBuilder setConCurLogNominalEntries(final int lgNomEntries) {
     bConCurLgNomLongs = lgNomEntries;
     if (bConCurLgNomLongs > ThetaUtil.MAX_LG_NOM_LONGS || bConCurLgNomLongs < ThetaUtil.MIN_LG_NOM_LONGS) {
       throw new SketchesArgumentException(
@@ -195,7 +195,7 @@ public int getConCurLgNominalEntries() {
    * @param seed See seed
    * @return this UpdatableThetaSketchBuilder
    */
-  public UpdateSketchBuilder setSeed(final long seed) {
+  public UpdatableThetaSketchBuilder setSeed(final long seed) {
     bSeed = seed;
     return this;
   }
@@ -213,7 +213,7 @@ public long getSeed() {
    * @param p See Sampling Probability, p
    * @return this UpdatableThetaSketchBuilder
    */
-  public UpdateSketchBuilder setP(final float p) {
+  public UpdatableThetaSketchBuilder setP(final float p) {
     if (p <= 0.0 || p > 1.0) {
       throw new SketchesArgumentException("p must be > 0 and <= 1.0: " + p);
     }
@@ -234,7 +234,7 @@ public float getP() {
    * @param rf See Resize Factor
    * @return this UpdatableThetaSketchBuilder
    */
-  public UpdateSketchBuilder setResizeFactor(final ResizeFactor rf) {
+  public UpdatableThetaSketchBuilder setResizeFactor(final ResizeFactor rf) {
     bRF = rf;
     return this;
   }
@@ -252,7 +252,7 @@ public ResizeFactor getResizeFactor() {
    * @param family the family for this builder
    * @return this UpdatableThetaSketchBuilder
    */
-  public UpdateSketchBuilder setFamily(final Family family) {
+  public UpdatableThetaSketchBuilder setFamily(final Family family) {
     bFam = family;
     return this;
   }
@@ -270,7 +270,7 @@ public Family getFamily() {
    * @param mSegReq the given MemorySegmentRequest
    * @return this UpdatableThetaSketchBuilder
    */
-  public UpdateSketchBuilder setMemorySegmentRequest(final MemorySegmentRequest mSegReq) {
+  public UpdatableThetaSketchBuilder setMemorySegmentRequest(final MemorySegmentRequest mSegReq) {
     bMemorySegmentRequest = mSegReq;
     return this;
   }
@@ -307,7 +307,7 @@ public int getNumPoolThreads() {
    * @param prop the given value
    * @return this UpdatableThetaSketchBuilder
    */
-  public UpdateSketchBuilder setPropagateOrderedCompact(final boolean prop) {
+  public UpdatableThetaSketchBuilder setPropagateOrderedCompact(final boolean prop) {
     bPropagateOrderedCompact = prop;
     return this;
   }
@@ -514,7 +514,7 @@ public UpdatableThetaSketch buildLocal(final UpdatableThetaSketch shared) {
   @Override
   public String toString() {
     final StringBuilder sb = new StringBuilder();
-    sb.append("UpdateSketchBuilder configuration:").append(LS);
+    sb.append("UpdatableThetaSketchBuilder configuration:").append(LS);
     sb.append("LgK:").append(TAB).append(bLgNomLongs).append(LS);
     sb.append("K:").append(TAB).append(1 << bLgNomLongs).append(LS);
     sb.append("LgLocalK:").append(TAB).append(bConCurLgNomLongs).append(LS);
diff --git a/src/main/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSets.java b/src/main/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSets.java
index 81e677687..992921bb7 100644
--- a/src/main/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSets.java
+++ b/src/main/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSets.java
@@ -23,7 +23,7 @@
 
 import org.apache.datasketches.common.BoundsOnRatiosInSampledSets;
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.tuple.Sketch;
+import org.apache.datasketches.tuple.TupleSketch;
 import org.apache.datasketches.tuple.Summary;
 
 /**
@@ -60,8 +60,8 @@ private BoundsOnRatiosInTupleSketchedSets() {}
    * @return the approximate lower bound for B over A
    */
   public static  double getLowerBoundForBoverA(
-      final Sketch sketchA,
-      final Sketch sketchB) {
+      final TupleSketch sketchA,
+      final TupleSketch sketchB) {
     final long thetaLongA = sketchA.getThetaLong();
     final long thetaLongB = sketchB.getThetaLong();
     checkThetas(thetaLongA, thetaLongB);
@@ -84,7 +84,7 @@ public static  double getLowerBoundForBoverA(
    * @return the approximate lower bound for B over A
    */
   public static  double getLowerBoundForBoverA(
-      final Sketch sketchA,
+      final TupleSketch sketchA,
       final org.apache.datasketches.theta.ThetaSketch sketchB) {
     final long thetaLongA = sketchA.getThetaLong();
     final long thetaLongB = sketchB.getThetaLong();
@@ -108,8 +108,8 @@ public static  double getLowerBoundForBoverA(
    * @return the approximate upper bound for B over A
    */
   public static  double getUpperBoundForBoverA(
-      final Sketch sketchA,
-      final Sketch sketchB) {
+      final TupleSketch sketchA,
+      final TupleSketch sketchB) {
     final long thetaLongA = sketchA.getThetaLong();
     final long thetaLongB = sketchB.getThetaLong();
     checkThetas(thetaLongA, thetaLongB);
@@ -132,7 +132,7 @@ public static  double getUpperBoundForBoverA(
    * @return the approximate upper bound for B over A
    */
   public static  double getUpperBoundForBoverA(
-      final Sketch sketchA,
+      final TupleSketch sketchA,
       final org.apache.datasketches.theta.ThetaSketch sketchB) {
     final long thetaLongA = sketchA.getThetaLong();
     final long thetaLongB = sketchB.getThetaLong();
@@ -156,8 +156,8 @@ public static  double getUpperBoundForBoverA(
    * @return the estimate for B over A
    */
   public static  double getEstimateOfBoverA(
-      final Sketch sketchA,
-      final Sketch sketchB) {
+      final TupleSketch sketchA,
+      final TupleSketch sketchB) {
     final long thetaLongA = sketchA.getThetaLong();
     final long thetaLongB = sketchB.getThetaLong();
     checkThetas(thetaLongA, thetaLongB);
@@ -180,7 +180,7 @@ public static  double getEstimateOfBoverA(
    * @return the estimate for B over A
    */
   public static  double getEstimateOfBoverA(
-      final Sketch sketchA,
+      final TupleSketch sketchA,
       final org.apache.datasketches.theta.ThetaSketch sketchB) {
     final long thetaLongA = sketchA.getThetaLong();
     final long thetaLongB = sketchB.getThetaLong();
diff --git a/src/main/java/org/apache/datasketches/tuple/CompactSketch.java b/src/main/java/org/apache/datasketches/tuple/CompactTupleSketch.java
similarity index 89%
rename from src/main/java/org/apache/datasketches/tuple/CompactSketch.java
rename to src/main/java/org/apache/datasketches/tuple/CompactTupleSketch.java
index b05fd9c15..030eae7e5 100644
--- a/src/main/java/org/apache/datasketches/tuple/CompactSketch.java
+++ b/src/main/java/org/apache/datasketches/tuple/CompactTupleSketch.java
@@ -32,16 +32,16 @@
 import org.apache.datasketches.common.SketchesArgumentException;
 
 /**
- * CompactSketches are never created directly. They are created as a result of
- * the compact() method of an UpdatableSketch or as a result of the getResult()
- * method of a set operation like Union, Intersection or AnotB. CompactSketch
- * consists of a compact list (i.e. no intervening spaces) of hash values,
+ * CompactTupleSketches are never created directly. They are created as a result of
+ * the compact() method of an UpdatableTupleSketch or as a result of the getResult()
+ * method of a set operation like TupleUnion, TupleIntersection or TupleAnotB.
+ * CompactTupleSketch consists of a compact list (i.e. no intervening spaces) of hash values,
  * corresponding list of Summaries, and a value for theta. The lists may or may
- * not be ordered. CompactSketch is read-only.
+ * not be ordered. CompactTupleSketch is read-only.
  *
  * @param  type of Summary
  */
-public final class CompactSketch extends Sketch {
+public final class CompactTupleSketch extends TupleSketch {
   private static final byte serialVersionWithSummaryClassNameUID = 1;
   private static final byte serialVersionUIDLegacy = 2;
   private static final byte serialVersionUID = 3;
@@ -54,13 +54,13 @@ private enum FlagsLegacy { IS_BIG_ENDIAN, IS_EMPTY, HAS_ENTRIES, IS_THETA_INCLUD
   private enum Flags { IS_RESERVED, IS_READ_ONLY, IS_EMPTY, IS_COMPACT, IS_ORDERED }
 
   /**
-   * Create a CompactSketch from correct components
+   * Create a CompactTupleSketch from correct components
    * @param hashArr compacted hash array
    * @param summaryArr compacted summary array
    * @param thetaLong long value of theta
    * @param empty empty flag
    */
-  CompactSketch(final long[] hashArr, final S[] summaryArr, final long thetaLong, final boolean empty) {
+  CompactTupleSketch(final long[] hashArr, final S[] summaryArr, final long thetaLong, final boolean empty) {
     super(thetaLong, empty, null);
     super.thetaLong_ = thetaLong;
     super.empty_ = empty;
@@ -69,12 +69,12 @@ private enum Flags { IS_RESERVED, IS_READ_ONLY, IS_EMPTY, IS_COMPACT, IS_ORDERED
   }
 
   /**
-   * This is to create an instance of a CompactSketch given a serialized form
+   * This is to create an instance of a CompactTupleSketch given a serialized form
    *
-   * @param seg MemorySegment object with serialized CompactSketch
+   * @param seg MemorySegment object with serialized CompactTupleSketch
    * @param deserializer the SummaryDeserializer
    */
-  CompactSketch(final MemorySegment seg, final SummaryDeserializer deserializer) {
+  CompactTupleSketch(final MemorySegment seg, final SummaryDeserializer deserializer) {
     super(Long.MAX_VALUE, true, null);
     int offset = 0;
     final byte preambleLongs = seg.get(JAVA_BYTE, offset++);
@@ -86,7 +86,7 @@ private enum Flags { IS_RESERVED, IS_READ_ONLY, IS_EMPTY, IS_COMPACT, IS_ORDERED
           "Unsupported serial version. Expected: " + serialVersionUID + " or lower, actual: " + version);
     }
     SerializerDeserializer
-      .validateType(seg.get(JAVA_BYTE, offset++), SerializerDeserializer.SketchType.CompactSketch);
+      .validateType(seg.get(JAVA_BYTE, offset++), SerializerDeserializer.SketchType.CompactTupleSketch);
     if (version <= serialVersionUIDLegacy) { // legacy serial format
       final byte flags = seg.get(JAVA_BYTE, offset++);
       empty_ = (flags & (1 << FlagsLegacy.IS_EMPTY.ordinal())) > 0;
@@ -166,7 +166,7 @@ private int readSummary(final MemorySegment seg, final int offset, final int i,
   }
 
   @Override
-  public CompactSketch compact() {
+  public CompactTupleSketch compact() {
     return this;
   }
 
@@ -214,7 +214,7 @@ public byte[] toByteArray() {
     bytes[offset++] = (byte) preambleLongs;
     bytes[offset++] = serialVersionUID;
     bytes[offset++] = (byte) Family.TUPLE.getID();
-    bytes[offset++] = (byte) SerializerDeserializer.SketchType.CompactSketch.ordinal();
+    bytes[offset++] = (byte) SerializerDeserializer.SketchType.CompactTupleSketch.ordinal();
     offset++; // unused
     bytes[offset++] = (byte) (
         (1 << Flags.IS_COMPACT.ordinal())
diff --git a/src/main/java/org/apache/datasketches/tuple/Filter.java b/src/main/java/org/apache/datasketches/tuple/Filter.java
index 2ed156b84..8706043c1 100644
--- a/src/main/java/org/apache/datasketches/tuple/Filter.java
+++ b/src/main/java/org/apache/datasketches/tuple/Filter.java
@@ -24,7 +24,7 @@
 import java.util.function.Predicate;
 
 /**
- * Class for filtering entries from a {@link Sketch} given a {@link Summary}
+ * Class for filtering entries from a {@link TupleSketch} given a {@link Summary}
  *
  * @param  Summary type against which apply the {@link Predicate}
  */
@@ -35,22 +35,22 @@ public class Filter {
      * Filter constructor with a {@link Predicate}
      *  @param predicate Predicate to use in this filter. If the Predicate returns False, the
      *  element is discarded. If the Predicate returns True, then the element is kept in the
-     *  {@link Sketch}
+     *  {@link TupleSketch}
      */
     public Filter(final Predicate predicate) {
         this.predicate = predicate;
     }
 
     /**
-     * Filters elements on the provided {@link Sketch}
+     * Filters elements on the provided {@link TupleSketch}
      *
-     * @param sketchIn The sketch against which apply the {@link Predicate}
-     * @return A new Sketch with some of the entries filtered out based on the {@link Predicate}
+     * @param sketchIn The sketch against which to apply the {@link Predicate}
+     * @return A new CompactTupleSketch with some of the entries filtered out based on the {@link Predicate}
      */
     @SuppressWarnings("unchecked")
-    public CompactSketch filter(final Sketch sketchIn) {
+    public CompactTupleSketch filter(final TupleSketch sketchIn) {
         if (sketchIn == null) {
-            return new CompactSketch<>(null, null, Long.MAX_VALUE, true);
+            return new CompactTupleSketch<>(null, null, Long.MAX_VALUE, true);
         }
         final long[] hashes = new long[sketchIn.getRetainedEntries()];
         T[] summaries = null; // lazy init to get class from the first entry
@@ -66,11 +66,11 @@ public CompactSketch filter(final Sketch sketchIn) {
               summaries[i++] = (T) summary.copy();
             }
         }
-        final boolean isEmpty = i == 0 && !sketchIn.isEstimationMode(); 
+        final boolean isEmpty = i == 0 && !sketchIn.isEstimationMode();
         if (i == 0) {
-          return new CompactSketch<>(null, null, sketchIn.getThetaLong(), isEmpty);
+          return new CompactTupleSketch<>(null, null, sketchIn.getThetaLong(), isEmpty);
         }
-        return new CompactSketch<>(Arrays.copyOf(hashes, i), Arrays.copyOf(summaries, i), sketchIn.getThetaLong(), isEmpty);
+        return new CompactTupleSketch<>(Arrays.copyOf(hashes, i), Arrays.copyOf(summaries, i), sketchIn.getThetaLong(), isEmpty);
     }
 }
 
diff --git a/src/main/java/org/apache/datasketches/tuple/HashTables.java b/src/main/java/org/apache/datasketches/tuple/HashTables.java
index 419b3dad6..877ce3d55 100644
--- a/src/main/java/org/apache/datasketches/tuple/HashTables.java
+++ b/src/main/java/org/apache/datasketches/tuple/HashTables.java
@@ -28,6 +28,8 @@
 
 import java.lang.reflect.Array;
 
+import org.apache.datasketches.theta.HashIterator;
+import org.apache.datasketches.theta.ThetaSketch;
 import org.apache.datasketches.thetacommon.ThetaUtil;
 
 @SuppressWarnings("unchecked")
@@ -40,7 +42,7 @@ class HashTables {
   HashTables() { }
 
   //must have valid entries
-  void fromSketch(final Sketch sketch) {
+  void fromSketch(final TupleSketch sketch) {
     numKeys = sketch.getRetainedEntries();
     lgTableSize = getLgTableSize(numKeys);
 
@@ -58,12 +60,12 @@ void fromSketch(final Sketch sketch) {
   }
 
   //must have valid entries
-  void fromSketch(final org.apache.datasketches.theta.ThetaSketch sketch, final S summary) {
+  void fromSketch(final ThetaSketch sketch, final S summary) {
     numKeys = sketch.getRetainedEntries(true);
     lgTableSize = getLgTableSize(numKeys);
 
     hashTable = new long[1 << lgTableSize];
-    final org.apache.datasketches.theta.HashIterator it = sketch.iterator();
+    final HashIterator it = sketch.iterator();
     while (it.next()) {
       final long hash = it.get();
       final int index = hashInsertOnly(hashTable, lgTableSize, hash);
@@ -92,9 +94,9 @@ private void fromArrays(final long[] hashArr, final S[] summaryArr, final int co
     }
   }
 
-  //For Tuple Sketches
+  //For TupleSketches
   HashTables getIntersectHashTables(
-      final Sketch nextTupleSketch,
+      final TupleSketch nextTupleSketch,
       final long thetaLong,
       final SummarySetOperations summarySetOps) {
 
@@ -121,9 +123,9 @@ HashTables getIntersectHashTables(
     return resultHT;
   }
 
-  //For Theta Sketches
+  //For ThetaSketches
   HashTables getIntersectHashTables(
-      final org.apache.datasketches.theta.ThetaSketch nextThetaSketch,
+      final ThetaSketch nextThetaSketch,
       final long thetaLong,
       final SummarySetOperations summarySetOps,
       final S summary) {
@@ -135,7 +137,7 @@ HashTables getIntersectHashTables(
     final long[] matchHashArr = new long[maxMatchSize];
     final S[] matchSummariesArr = (S[]) Array.newInstance(summaryType, maxMatchSize);
     int matchCount = 0;
-    final org.apache.datasketches.theta.HashIterator it = nextThetaSketch.iterator();
+    final HashIterator it = nextThetaSketch.iterator();
 
     //scan B & search A(hashTable) for match
     while (it.next()) {
diff --git a/src/main/java/org/apache/datasketches/tuple/JaccardSimilarity.java b/src/main/java/org/apache/datasketches/tuple/JaccardSimilarity.java
index 2a57a16a5..3df418737 100644
--- a/src/main/java/org/apache/datasketches/tuple/JaccardSimilarity.java
+++ b/src/main/java/org/apache/datasketches/tuple/JaccardSimilarity.java
@@ -27,10 +27,11 @@
 import static org.apache.datasketches.thetacommon.BoundsOnRatiosInTupleSketchedSets.getUpperBoundForBoverA;
 
 import org.apache.datasketches.common.SketchesArgumentException;
+import org.apache.datasketches.theta.ThetaSketch;
 import org.apache.datasketches.thetacommon.ThetaUtil;
 
 /**
- * Jaccard similarity of two Tuple Sketches, or alternatively, of a Tuple and Theta Sketch.
+ * Jaccard similarity of two TupleSketches, or alternatively, of a TupleSketch and a ThetaSketch.
  *
  * 
    Note: only retained hash values are compared, and the Tuple summary values are not accounted for in the
  * similarity measure.
    
@@ -52,16 +53,16 @@ public final class JaccardSimilarity {
    * 
    Note: For very large pairs of sketches, where the configured nominal entries of the sketches
    * are 2^25 or 2^26, this method may produce unpredictable results.
    *
-   * @param sketchA The first argument, a Tuple sketch with summary type S
-   * @param sketchB The second argument, a Tuple sketch with summary type S
+   * @param sketchA The first argument, a TupleSketch with summary type S
+   * @param sketchB The second argument, a TupleSketch with summary type S
    * @param summarySetOps instance of SummarySetOperations used to unify or intersect summaries.
    * @param  Summary
    * @return a double array {LowerBound, Estimate, UpperBound} of the Jaccard index.
    * The Upper and Lower bounds are for a confidence interval of 95.4% or +/- 2 standard deviations.
    */
   public static  double[] jaccard(
-      final Sketch sketchA,
-      final Sketch sketchB,
+      final TupleSketch sketchA,
+      final TupleSketch sketchB,
       final SummarySetOperations summarySetOps) {
     //Corner case checks
     if (sketchA == null || sketchB == null) { return ZEROS.clone(); }
@@ -71,15 +72,15 @@ public static  double[] jaccard(
     final int countA = sketchA.getRetainedEntries();
     final int countB = sketchB.getRetainedEntries();
 
-    //Create the Union
+    //Create the TupleUnion
     final int minK = 1 << ThetaUtil.MIN_LG_NOM_LONGS;
     final int maxK = 1 << ThetaUtil.MAX_LG_NOM_LONGS;
     final int newK = max(min(ceilingPowerOf2(countA + countB), maxK), minK);
-    final Union union = new Union<>(newK, summarySetOps);
+    final TupleUnion union = new TupleUnion<>(newK, summarySetOps);
     union.union(sketchA);
     union.union(sketchB);
 
-    final Sketch unionAB = union.getResult();
+    final TupleSketch unionAB = union.getResult();
     final long thetaLongUAB = unionAB.getThetaLong();
     final long thetaLongA = sketchA.getThetaLong();
     final long thetaLongB = sketchB.getThetaLong();
@@ -91,12 +92,12 @@ public static  double[] jaccard(
       return ONES.clone();
     }
 
-    //Create the Intersection
-    final Intersection inter = new Intersection<>(summarySetOps);
+    //Create the TupleIntersection
+    final TupleIntersection inter = new TupleIntersection<>(summarySetOps);
     inter.intersect(sketchA);
     inter.intersect(sketchB);
     inter.intersect(unionAB); //ensures that intersection is a subset of the union
-    final Sketch interABU = inter.getResult();
+    final TupleSketch interABU = inter.getResult();
 
     final double lb = getLowerBoundForBoverA(unionAB, interABU);
     final double est = getEstimateOfBoverA(unionAB, interABU);
@@ -114,9 +115,9 @@ public static  double[] jaccard(
    * 
    Note: For very large pairs of sketches, where the configured nominal entries of the sketches
    * are 2^25 or 2^26, this method may produce unpredictable results.
    *
-   * @param sketchA The first argument, a Tuple sketch with summary type S
-   * @param sketchB The second argument, a Theta sketch
-   * @param summary the given proxy summary for the theta sketch, which doesn't have one.
+   * @param sketchA The first argument, a TupleSketch with summary type S
+   * @param sketchB The second argument, a ThetaSketch
+   * @param summary the given proxy summary for the ThetaSketch, which doesn't have one.
    * This may not be null.
    * @param summarySetOps instance of SummarySetOperations used to unify or intersect summaries.
    * @param  Summary
@@ -124,8 +125,8 @@ public static  double[] jaccard(
    * The Upper and Lower bounds are for a confidence interval of 95.4% or +/- 2 standard deviations.
    */
   public static  double[] jaccard(
-      final Sketch sketchA,
-      final org.apache.datasketches.theta.ThetaSketch sketchB,
+      final TupleSketch sketchA,
+      final ThetaSketch sketchB,
       final S summary, final SummarySetOperations summarySetOps) {
     // Null case checks
     if (summary == null) {
@@ -139,15 +140,15 @@ public static  double[] jaccard(
     final int countA = sketchA.getRetainedEntries();
     final int countB = sketchB.getRetainedEntries(true);
 
-    //Create the Union
+    //Create the Tuple/Theta Union
     final int minK = 1 << ThetaUtil.MIN_LG_NOM_LONGS;
     final int maxK = 1 << ThetaUtil.MAX_LG_NOM_LONGS;
     final int newK = max(min(ceilingPowerOf2(countA + countB), maxK), minK);
-    final Union union = new Union<>(newK, summarySetOps);
+    final TupleUnion union = new TupleUnion<>(newK, summarySetOps);
     union.union(sketchA);
     union.union(sketchB, summary);
 
-    final Sketch unionAB = union.getResult();
+    final TupleSketch unionAB = union.getResult();
     final long thetaLongUAB = unionAB.getThetaLong();
     final long thetaLongA = sketchA.getThetaLong();
     final long thetaLongB = sketchB.getThetaLong();
@@ -159,12 +160,12 @@ public static  double[] jaccard(
       return ONES.clone();
     }
 
-    //Create the Intersection
-    final Intersection inter = new Intersection<>(summarySetOps);
+    //Create the Tuple/Theta Intersection
+    final TupleIntersection inter = new TupleIntersection<>(summarySetOps);
     inter.intersect(sketchA);
     inter.intersect(sketchB, summary);
     inter.intersect(unionAB); //ensures that intersection is a subset of the union
-    final Sketch interABU = inter.getResult();
+    final TupleSketch interABU = inter.getResult();
 
     final double lb = getLowerBoundForBoverA(unionAB, interABU);
     final double est = getEstimateOfBoverA(unionAB, interABU);
@@ -175,16 +176,16 @@ public static  double[] jaccard(
   /**
    * Returns true if the two given sketches have exactly the same hash values and the same
    * theta values. Thus, they are equivalent.
-   * @param sketchA The first argument, a Tuple sketch with summary type S
-   * @param sketchB The second argument, a Tuple sketch with summary type S
+   * @param sketchA The first argument, a TupleSketch with summary type S
+   * @param sketchB The second argument, a TupleSketch with summary type S
    * @param summarySetOps instance of SummarySetOperations used to unify or intersect summaries.
    * @param  Summary
    * @return true if the two given sketches have exactly the same hash values and the same
    * theta values.
    */
   public static  boolean exactlyEqual(
-      final Sketch sketchA,
-      final Sketch sketchB,
+      final TupleSketch sketchA,
+      final TupleSketch sketchB,
       final SummarySetOperations summarySetOps) {
     //Corner case checks
     if (sketchA == null || sketchB == null) { return false; }
@@ -195,11 +196,11 @@ public static  boolean exactlyEqual(
     final int countA = sketchA.getRetainedEntries();
     final int countB = sketchB.getRetainedEntries();
 
-    //Create the Union
-    final Union union = new Union<>(ceilingPowerOf2(countA + countB), summarySetOps);
+    //Create the TupleUnion
+    final TupleUnion union = new TupleUnion<>(ceilingPowerOf2(countA + countB), summarySetOps);
     union.union(sketchA);
     union.union(sketchB);
-    final Sketch unionAB = union.getResult();
+    final TupleSketch unionAB = union.getResult();
     final long thetaLongUAB = unionAB.getThetaLong();
     final long thetaLongA = sketchA.getThetaLong();
     final long thetaLongB = sketchB.getThetaLong();
@@ -216,9 +217,9 @@ public static  boolean exactlyEqual(
   /**
    * Returns true if the two given sketches have exactly the same hash values and the same
    * theta values. Thus, they are equivalent.
-   * @param sketchA The first argument, a Tuple sketch with summary type S
-   * @param sketchB The second argument, a Theta sketch
-   * @param summary the given proxy summary for the theta sketch, which doesn't have one.
+   * @param sketchA The first argument, a TupleSketch with summary type S
+   * @param sketchB The second argument, a ThetaSketch
+   * @param summary the given proxy summary for the ThetaSketch, which doesn't have one.
    * This may not be null.
    * @param summarySetOps instance of SummarySetOperations used to unify or intersect summaries.
    * @param  Summary
@@ -226,8 +227,8 @@ public static  boolean exactlyEqual(
    * theta values.
    */
   public static  boolean exactlyEqual(
-      final Sketch sketchA,
-      final org.apache.datasketches.theta.ThetaSketch sketchB,
+      final TupleSketch sketchA,
+      final ThetaSketch sketchB,
       final S summary, final SummarySetOperations summarySetOps) {
     // Null case checks
     if (summary == null) {
@@ -241,11 +242,11 @@ public static  boolean exactlyEqual(
     final int countA = sketchA.getRetainedEntries();
     final int countB = sketchB.getRetainedEntries(true);
 
-    //Create the Union
-    final Union union = new Union<>(ceilingPowerOf2(countA + countB), summarySetOps);
+    //Create the TupleUnion
+    final TupleUnion union = new TupleUnion<>(ceilingPowerOf2(countA + countB), summarySetOps);
     union.union(sketchA);
     union.union(sketchB, summary);
-    final Sketch unionAB = union.getResult();
+    final TupleSketch unionAB = union.getResult();
     final long thetaLongUAB = unionAB.getThetaLong();
     final long thetaLongA = sketchA.getThetaLong();
     final long thetaLongB = sketchB.getThetaLong();
@@ -260,14 +261,14 @@ public static  boolean exactlyEqual(
   }
 
   /**
-   * Tests similarity of a measured Sketch against an expected Sketch.
+   * Tests similarity of a measured TupleSketch against an expected TupleSketch.
    * Computes the lower bound of the Jaccard index JLB of the measured and
    * expected sketches.
    * if JLB ≥ threshold, then the sketches are considered to be
    * similar with a confidence of 97.7%.
    *
-   * @param measured a Tuple sketch with summary type S to be tested
-   * @param expected the reference Tuple sketch with summary type S that is considered to be correct.
+   * @param measured a TupleSketch with summary type S to be tested
+   * @param expected the reference TupleSketch with summary type S that is considered to be correct.
    * @param summarySetOps instance of SummarySetOperations used to unify or intersect summaries.
    * @param threshold a real value between zero and one.
    * @param  Summary
@@ -275,7 +276,7 @@ public static  boolean exactlyEqual(
    * with at least 97.7% confidence.
    */
   public static  boolean similarityTest(
-      final Sketch measured, final Sketch expected,
+      final TupleSketch measured, final TupleSketch expected,
       final SummarySetOperations summarySetOps,
       final double threshold) {
     //index 0: the lower bound
@@ -286,15 +287,15 @@ public static  boolean similarityTest(
   }
 
   /**
-   * Tests similarity of a measured Sketch against an expected Sketch.
+   * Tests similarity of a measured TupleSketch against an expected ThetaSketch.
    * Computes the lower bound of the Jaccard index JLB of the measured and
    * expected sketches.
    * if JLB ≥ threshold, then the sketches are considered to be
    * similar with a confidence of 97.7%.
    *
-   * @param measured a Tuple sketch with summary type S to be tested
-   * @param expected the reference Theta sketch that is considered to be correct.
-   * @param summary the given proxy summary for the theta sketch, which doesn't have one.
+   * @param measured a TupleSketch with summary type S to be tested
+   * @param expected the reference ThetaSketch that is considered to be correct.
+   * @param summary the given proxy summary for the ThetaSketch, which doesn't have one.
    * This may not be null.
    * @param summarySetOps instance of SummarySetOperations used to unify or intersect summaries.
    * @param threshold a real value between zero and one.
@@ -303,7 +304,7 @@ public static  boolean similarityTest(
    * with at least 97.7% confidence.
    */
   public static  boolean similarityTest(
-      final Sketch measured, final org.apache.datasketches.theta.ThetaSketch expected,
+      final TupleSketch measured, final ThetaSketch expected,
       final S summary, final SummarySetOperations summarySetOps,
       final double threshold) {
     //index 0: the lower bound
@@ -314,14 +315,14 @@ public static  boolean similarityTest(
   }
 
   /**
-   * Tests dissimilarity of a measured Sketch against an expected Sketch.
+   * Tests dissimilarity of a measured TupleSketch against an expected TupleSketch.
    * Computes the upper bound of the Jaccard index JUB of the measured and
    * expected sketches.
    * if JUB ≤ threshold, then the sketches are considered to be
    * dissimilar with a confidence of 97.7%.
    *
-   * @param measured a Tuple sketch with summary type S to be tested
-   * @param expected the reference Theta sketch that is considered to be correct.
+   * @param measured a TupleSketch with summary type S to be tested
+   * @param expected the reference TupleSketch that is considered to be correct.
    * @param summarySetOps instance of SummarySetOperations used to unify or intersect summaries.
    * @param threshold a real value between zero and one.
    * @param  Summary
@@ -329,7 +330,7 @@ public static  boolean similarityTest(
    * with at least 97.7% confidence.
    */
   public static  boolean dissimilarityTest(
-      final Sketch measured, final Sketch expected,
+      final TupleSketch measured, final TupleSketch expected,
       final SummarySetOperations summarySetOps,
       final double threshold) {
     //index 0: the lower bound
@@ -340,15 +341,15 @@ public static  boolean dissimilarityTest(
   }
 
   /**
-   * Tests dissimilarity of a measured Sketch against an expected Sketch.
+   * Tests dissimilarity of a measured TupleSketch against an expected ThetaSketch.
    * Computes the upper bound of the Jaccard index JUB of the measured and
    * expected sketches.
    * if JUB ≤ threshold, then the sketches are considered to be
    * dissimilar with a confidence of 97.7%.
    *
-   * @param measured a Tuple sketch with summary type S to be tested
-   * @param expected the reference Theta sketch that is considered to be correct.
-   * @param summary the given proxy summary for the theta sketch, which doesn't have one.
+   * @param measured a TupleSketch with summary type S to be tested
+   * @param expected the reference ThetaSketch that is considered to be correct.
+   * @param summary the given proxy summary for the ThetaSketch, which doesn't have one.
    * This may not be null.
    * @param summarySetOps instance of SummarySetOperations used to unify or intersect summaries.
    * @param threshold a real value between zero and one.
@@ -357,7 +358,7 @@ public static  boolean dissimilarityTest(
    * with at least 97.7% confidence.
    */
   public static  boolean dissimilarityTest(
-      final Sketch measured, final org.apache.datasketches.theta.ThetaSketch expected,
+      final TupleSketch measured, final ThetaSketch expected,
       final S summary, final SummarySetOperations summarySetOps,
       final double threshold) {
     //index 0: the lower bound
diff --git a/src/main/java/org/apache/datasketches/tuple/QuickSelectSketch.java b/src/main/java/org/apache/datasketches/tuple/QuickSelectSketch.java
index 92355a77b..64548d6c1 100644
--- a/src/main/java/org/apache/datasketches/tuple/QuickSelectSketch.java
+++ b/src/main/java/org/apache/datasketches/tuple/QuickSelectSketch.java
@@ -45,7 +45,7 @@
  *
  * @param  type of Summary
  */
-class QuickSelectSketch extends Sketch {
+class QuickSelectSketch extends TupleSketch {
   private static final byte serialVersionUID = 2;
 
   private enum Flags { IS_RESERVED, IS_IN_SAMPLING_MODE, IS_EMPTY, HAS_ENTRIES, IS_THETA_INCLUDED }
@@ -174,9 +174,9 @@ private QuickSelectSketch(
    * @param seg MemorySegment object with serialized QuickSelectSketch
    * @param deserializer the SummaryDeserializer
    * @param summaryFactory the SummaryFactory
-   * @deprecated As of 3.0.0, heapifying an UpdatableSketch is deprecated.
+   * @deprecated As of 3.0.0, heapifying an UpdatableTupleSketch is deprecated.
    * This capability will be removed in a future release.
-   * Heapifying a CompactSketch is not deprecated.
+   * Heapifying a CompactTupleSketch is not deprecated.
    */
   @Deprecated
   QuickSelectSketch(
@@ -377,10 +377,10 @@ public void reset() {
    */
   @Override
   @SuppressWarnings("unchecked")
-  public CompactSketch compact() {
+  public CompactTupleSketch compact() {
     if (getRetainedEntries() == 0) {
-      if (empty_) { return new CompactSketch<>(null, null, Long.MAX_VALUE, true); }
-      return new CompactSketch<>(null, null, thetaLong_, false);
+      if (empty_) { return new CompactTupleSketch<>(null, null, Long.MAX_VALUE, true); }
+      return new CompactTupleSketch<>(null, null, thetaLong_, false);
     }
     final long[] hashArr = new long[getRetainedEntries()];
     final S[] summaryArr = Util.newSummaryArray(summaryTable_, getRetainedEntries());
@@ -392,7 +392,7 @@ public CompactSketch compact() {
         i++;
       }
     }
-    return new CompactSketch<>(hashArr, summaryArr, thetaLong_, empty_);
+    return new CompactTupleSketch<>(hashArr, summaryArr, thetaLong_, empty_);
   }
 
   // Layout of first 8 bytes:
@@ -401,11 +401,11 @@ public CompactSketch compact() {
   //      ||    7   |    6   |    5   |    4   |    3   |    2   |    1   |     0              |
   //  0   ||   RF   |  lgArr | lgNom  |  Flags | SkType | FamID  | SerVer |  Preamble_Longs    |
   /**
-   * This serializes an UpdatableSketch (QuickSelectSketch).
-   * @return serialized representation of an UpdatableSketch (QuickSelectSketch).
-   * @deprecated As of 3.0.0, serializing an UpdatableSketch is deprecated.
+   * This serializes an UpdatableTupleSketch (QuickSelectSketch).
+   * @return serialized representation of an UpdatableTupleSketch (QuickSelectSketch).
+   * @deprecated As of 3.0.0, serializing an UpdatableTupleSketch is deprecated.
    * This capability will be removed in a future release.
-   * Serializing a CompactSketch is not deprecated.
+   * Serializing a CompactTupleSketch is not deprecated.
    */
   @Deprecated
   @Override
diff --git a/src/main/java/org/apache/datasketches/tuple/SerializerDeserializer.java b/src/main/java/org/apache/datasketches/tuple/SerializerDeserializer.java
index 2ca7c29df..367ef9971 100644
--- a/src/main/java/org/apache/datasketches/tuple/SerializerDeserializer.java
+++ b/src/main/java/org/apache/datasketches/tuple/SerializerDeserializer.java
@@ -37,8 +37,8 @@ public final class SerializerDeserializer {
   public static enum SketchType {
     /** QuickSelectSketch */
     QuickSelectSketch,
-    /** CompactSketch */
-    CompactSketch,
+    /** CompactTupleSketch */
+    CompactTupleSketch,
     /** ArrayOfDoublesQuickSelectSketch */
     ArrayOfDoublesQuickSelectSketch,
     /** ArrayOfDoublesCompactSketch */
diff --git a/src/main/java/org/apache/datasketches/tuple/Sketches.java b/src/main/java/org/apache/datasketches/tuple/Sketches.java
deleted file mode 100644
index 6eef7f88d..000000000
--- a/src/main/java/org/apache/datasketches/tuple/Sketches.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.datasketches.tuple;
-
-import java.lang.foreign.MemorySegment;
-
-/**
- * Convenient static methods to instantiate generic tuple sketches.
- */
-@SuppressWarnings("deprecation")
-public final class Sketches {
-
-  /**
-   * Creates an empty sketch.
-   * @param  Type of Summary
-   * @return an empty instance of Sketch
-   */
-  public static  Sketch createEmptySketch() {
-    return new CompactSketch<>(null, null, Long.MAX_VALUE, true);
-  }
-
-  /**
-   * Instantiate a Sketch from a given MemorySegment.
-   * @param  Type of Summary
-   * @param seg MemorySegment object representing a Sketch
-   * @param deserializer instance of SummaryDeserializer
-   * @return Sketch created from its MemorySegment representation
-   */
-  public static  Sketch heapifySketch(
-      final MemorySegment seg,
-      final SummaryDeserializer deserializer) {
-    final SerializerDeserializer.SketchType sketchType = SerializerDeserializer.getSketchType(seg);
-    if (sketchType == SerializerDeserializer.SketchType.QuickSelectSketch) {
-      return new QuickSelectSketch<>(seg, deserializer, null);
-    }
-    return new CompactSketch<>(seg, deserializer);
-  }
-
-  /**
-   * Instantiate UpdatableSketch from a given MemorySegment
-   * @param  Type of update value
-   * @param  Type of Summary
-   * @param seg MemorySegment object representing a Sketch
-   * @param deserializer instance of SummaryDeserializer
-   * @param summaryFactory instance of SummaryFactory
-   * @return Sketch created from its MemorySegment representation
-   */
-  public static > UpdatableSketch heapifyUpdatableSketch(
-      final MemorySegment seg,
-      final SummaryDeserializer deserializer,
-      final SummaryFactory summaryFactory) {
-    return new UpdatableSketch<>(seg, deserializer, summaryFactory);
-  }
-
-}
diff --git a/src/main/java/org/apache/datasketches/tuple/AnotB.java b/src/main/java/org/apache/datasketches/tuple/TupleAnotB.java
similarity index 81%
rename from src/main/java/org/apache/datasketches/tuple/AnotB.java
rename to src/main/java/org/apache/datasketches/tuple/TupleAnotB.java
index 25b7340fb..7676211b8 100644
--- a/src/main/java/org/apache/datasketches/tuple/AnotB.java
+++ b/src/main/java/org/apache/datasketches/tuple/TupleAnotB.java
@@ -30,32 +30,34 @@
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.SketchesStateException;
 import org.apache.datasketches.common.SuppressFBWarnings;
+import org.apache.datasketches.theta.CompactThetaSketch;
+import org.apache.datasketches.theta.ThetaSketch;
 import org.apache.datasketches.thetacommon.SetOperationCornerCases;
-import org.apache.datasketches.thetacommon.ThetaUtil;
 import org.apache.datasketches.thetacommon.SetOperationCornerCases.AnotbAction;
 import org.apache.datasketches.thetacommon.SetOperationCornerCases.CornerCase;
+import org.apache.datasketches.thetacommon.ThetaUtil;
 
 /**
- * Computes a set difference, A-AND-NOT-B, of two generic tuple sketches.
+ * Computes a set difference, A-AND-NOT-B, of two generic TupleSketches.
  * This class includes both stateful and stateless operations.
  *
- * 
    The stateful operation is as follows:
    
+ * 
    The stateful operation is as in the following example:
    
  * 
    
- * AnotB anotb = new AnotB();
+ * TupleAnotB anotb = new TupleAnotB();
  *
- * anotb.setA(Sketch skA); //The first argument.
- * anotb.notB(Sketch skB); //The second (subtraction) argument.
- * anotb.notB(Sketch skC); // ...any number of additional subtractions...
+ * anotb.setA(TupleSketch skA); //The first argument.
+ * anotb.notB(TupleSketch skB); //The second (subtraction) argument.
+ * anotb.notB(TupleSketch skC); // ...any number of additional subtractions...
  * anotb.getResult(false); //Get an interim result.
- * anotb.notB(Sketch skD); //Additional subtractions.
- * anotb.getResult(true);  //Final result and resets the AnotB operator.
+ * anotb.notB(TupleSketch skD); //Additional subtractions.
+ * anotb.getResult(true);  //Final result and resets the TupleAnotB operator.
  * 
    
  *
- * 
    The stateless operation is as follows:
    
+ * 
    The stateless operation is as in the following example:
    
  * 
    
- * AnotB anotb = new AnotB();
+ * TupleAnotB anotb = new TupleAnotB();
  *
- * CompactSketch csk = anotb.aNotB(Sketch skA, Sketch skB);
+ * CompactTupleSketch csk = anotb.aNotB(TupleSketch skA, TupleSketch skB);
  * 
    
  *
  * 
    Calling the setA operation a second time essentially clears the internal state and loads
@@ -67,7 +69,7 @@
  *
  * @author Lee Rhodes
  */
-public final class AnotB {
+public final class TupleAnotB {
   private boolean empty_ = true;
   private long thetaLong_ = Long.MAX_VALUE;
   private long[] hashArr_ = null;   //always in compact form, not necessarily sorted
@@ -78,7 +80,7 @@ public final class AnotB {
 
   static {
     try {
-      GET_CACHE = org.apache.datasketches.theta.ThetaSketch.class.getDeclaredMethod("getCache");
+      GET_CACHE = ThetaSketch.class.getDeclaredMethod("getCache");
       GET_CACHE.setAccessible(true);
     } catch (final Exception e) {
       throw new SketchesStateException("Could not reflect getCache(): " + e);
@@ -86,9 +88,9 @@ public final class AnotB {
   }
 
   /**
-   * This is part of a multistep, stateful AnotB operation and sets the given Tuple sketch as the
+   * This is part of a multistep, stateful TupleAnotB operation and sets the given TupleSketch as the
    * first argument A of A-AND-NOT-B. This overwrites the internal state of this
-   * AnotB operator with the contents of the given sketch.
+   * TupleAnotB operator with the contents of the given sketch.
    * This sets the stage for multiple following notB steps.
    *
    * 
    An input argument of null will throw an exception.
    
@@ -110,7 +112,7 @@ public final class AnotB {
    *
    * @param skA The incoming sketch for the first argument, A.
    */
-  public void setA(final Sketch skA) {
+  public void setA(final TupleSketch skA) {
     if (skA == null) {
       reset();
       throw new SketchesArgumentException("The input argument A may not be null");
@@ -125,9 +127,9 @@ public void setA(final Sketch skA) {
   }
 
   /**
-   * This is part of a multistep, stateful AnotB operation and sets the given Tuple sketch as the
+   * This is part of a multistep, stateful TupleAnotB operation and sets the given TupleSketch as the
    * second (or n+1th) argument B of A-AND-NOT-B.
-   * Performs an AND NOT operation with the existing internal state of this AnotB operator.
+   * Performs an AND NOT operation with the existing internal state of this TupleAnotB operator.
    *
    * 
    An input argument of null or empty is ignored.
    
    *
@@ -141,7 +143,7 @@ public void setA(final Sketch skA) {
    *
    * @param skB The incoming Tuple sketch for the second (or following) argument B.
    */
-  public void notB(final Sketch skB) {
+  public void notB(final TupleSketch skB) {
     if (skB == null) { return; } //ignore
 
     final long thetaLongB = skB.getThetaLong();
@@ -195,11 +197,11 @@ public void notB(final Sketch skB) {
   }
 
   /**
-   * This is part of a multistep, stateful AnotB operation and sets the given Theta sketch as the
+   * This is part of a multistep, stateful TupleAnotB operation and sets the given ThetaSketch as the
    * second (or n+1th) argument B of A-AND-NOT-B.
-   * Performs an AND NOT operation with the existing internal state of this AnotB operator.
+   * Performs an AND NOT operation with the existing internal state of this TupleAnotB operator.
    * Calls to this method can be intermingled with calls to
-   * {@link #notB(org.apache.datasketches.theta.ThetaSketch)}.
+   * {@link #notB(ThetaSketch)}.
    *
    * 
    An input argument of null or empty is ignored.
    
    *
@@ -211,9 +213,9 @@ public void notB(final Sketch skB) {
    *
    * 
    Use {@link #getResult(boolean)} to obtain the result.
    
    *
-   * @param skB The incoming Theta sketch for the second (or following) argument B.
+   * @param skB The incoming ThetaSketch for the second (or following) argument B.
    */
-  public void notB(final org.apache.datasketches.theta.ThetaSketch skB) {
+  public void notB(final ThetaSketch skB) {
     if (skB == null) { return; } //ignore
 
     final long thetaLongB = skB.getThetaLong();
@@ -266,32 +268,32 @@ public void notB(final org.apache.datasketches.theta.ThetaSketch skB) {
   }
 
   /**
-   * Gets the result of the multistep, stateful operation AnotB that have been executed with calls
-   * to {@link #setA(Sketch)} and ({@link #notB(Sketch)} or
-   * {@link #notB(org.apache.datasketches.theta.ThetaSketch)}).
+   * Gets the result of the multistep, stateful operation TupleAnotB that have been executed with calls
+   * to {@link #setA(TupleSketch)} and ({@link #notB(TupleSketch)} or
+   * {@link #notB(ThetaSketch)}).
    *
    * @param reset If true, clears this operator to the empty state after this result is
    * returned. Set this to false if you wish to obtain an intermediate result.
-   * @return the result of this operation as an unordered {@link CompactSketch}.
+   * @return the result of this operation as an unordered {@link CompactTupleSketch}.
    */
-  public CompactSketch getResult(final boolean reset) {
-    final CompactSketch result;
+  public CompactTupleSketch getResult(final boolean reset) {
+    final CompactTupleSketch result;
     if (curCount_ == 0) {
-      result = new CompactSketch<>(null, null, thetaLong_, thetaLong_ == Long.MAX_VALUE);
+      result = new CompactTupleSketch<>(null, null, thetaLong_, thetaLong_ == Long.MAX_VALUE);
     } else {
 
-      result = new CompactSketch<>(hashArr_, Util.copySummaryArray(summaryArr_), thetaLong_, false);
+      result = new CompactTupleSketch<>(hashArr_, Util.copySummaryArray(summaryArr_), thetaLong_, false);
     }
     if (reset) { reset(); }
     return result;
   }
 
   /**
-   * Returns the A-and-not-B set operation on the two given Tuple sketches.
+   * Returns the A-and-not-B set operation on the two given TupleSketches.
    *
    * 
    This a stateless operation and has no impact on the internal state of this operator.
-   * Thus, this is not an accumulating update and is independent of the {@link #setA(Sketch)},
-   * {@link #notB(Sketch)}, {@link #notB(org.apache.datasketches.theta.ThetaSketch)}, and
+   * Thus, this is not an accumulating update and is independent of the {@link #setA(TupleSketch)},
+   * {@link #notB(TupleSketch)}, {@link #notB(ThetaSketch)}, and
    * {@link #getResult(boolean)} methods.
    
    *
    * 
    If either argument is null an exception is thrown.
    
@@ -304,16 +306,16 @@ public CompactSketch getResult(final boolean reset) {
    * no following possible viable arguments for the second argument.
    * Since it is very likely that a null is a programming error, we throw an exception.
    
    *
-   * @param skA The incoming Tuple sketch for the first argument
-   * @param skB The incoming Tuple sketch for the second argument
+   * @param skA The incoming TupleSketch for the first argument
+   * @param skB The incoming TupleSketch for the second argument
    * @param  Type of Summary
-   * @return the result as an unordered {@link CompactSketch}
+   * @return the result as an unordered {@link CompactTupleSketch}
    */
   @SuppressFBWarnings(value = "UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR",
       justification = "hashArr and summaryArr are guaranteed to be valid due to the switch on CornerCase")
-  public static  CompactSketch aNotB(
-      final Sketch skA,
-      final Sketch skB) {
+  public static  CompactTupleSketch aNotB(
+      final TupleSketch skA,
+      final TupleSketch skB) {
     if (skA == null || skB == null) {
       throw new SketchesArgumentException("Neither argument may be null for this stateless operation.");
     }
@@ -331,20 +333,20 @@ public static  CompactSketch aNotB(
     final CornerCase cCase = CornerCase.caseIdToCornerCase(id);
     final AnotbAction anotbAction = cCase.getAnotbAction();
 
-    CompactSketch result = null;
+    CompactTupleSketch result = null;
 
     switch (anotbAction) {
       case EMPTY_1_0_T: {
-        result = new CompactSketch<>(null, null, Long.MAX_VALUE, true);
+        result = new CompactTupleSketch<>(null, null, Long.MAX_VALUE, true);
         break;
       }
       case DEGEN_MIN_0_F: {
         final long thetaLong = min(thetaLongA, thetaLongB);
-        result = new CompactSketch<>(null, null, thetaLong, false);
+        result = new CompactTupleSketch<>(null, null, thetaLong, false);
         break;
       }
       case DEGEN_THA_0_F: {
-        result = new CompactSketch<>(null, null, thetaLongA, false);
+        result = new CompactTupleSketch<>(null, null, thetaLongA, false);
         break;
       }
       case TRIM_A: {
@@ -353,12 +355,12 @@ public static  CompactSketch aNotB(
         final S[] summaryArrA = daA.summaryArr;
         final long minThetaLong =  min(thetaLongA, thetaLongB);
         final DataArrays da = trimAndCopyDataArrays(hashArrA, summaryArrA, minThetaLong, false);
-        result = new CompactSketch<>(da.hashArr, da.summaryArr, minThetaLong, skA.empty_);
+        result = new CompactTupleSketch<>(da.hashArr, da.summaryArr, minThetaLong, skA.empty_);
         break;
       }
       case SKETCH_A: {
         final DataArrays daA = getCopyOfDataArraysTuple(skA);
-        result = new CompactSketch<>(daA.hashArr, daA.summaryArr, thetaLongA, skA.empty_);
+        result = new CompactTupleSketch<>(daA.hashArr, daA.summaryArr, thetaLongA, skA.empty_);
         break;
       }
       case FULL_ANOTB: { //both A and B should have valid entries.
@@ -368,9 +370,9 @@ public static  CompactSketch aNotB(
             getCopyOfResultArraysTuple(minThetaLong, daA.hashArr.length, daA.hashArr, daA.summaryArr, skB);
         final int countR = (daR.hashArr == null) ? 0 : daR.hashArr.length;
         if (countR == 0) {
-          result = new CompactSketch<>(null, null, minThetaLong, minThetaLong == Long.MAX_VALUE);
+          result = new CompactTupleSketch<>(null, null, minThetaLong, minThetaLong == Long.MAX_VALUE);
         } else {
-          result = new CompactSketch<>(daR.hashArr, daR.summaryArr, minThetaLong, false);
+          result = new CompactTupleSketch<>(daR.hashArr, daR.summaryArr, minThetaLong, false);
         }
       }
       //default: not possible
@@ -379,11 +381,11 @@ public static  CompactSketch aNotB(
   }
 
   /**
-   * Returns the A-and-not-B set operation on a Tuple sketch and a Theta sketch.
+   * Returns the A-and-not-B set operation on a TupleSketch and a ThetaSketch.
    *
    * 
    This a stateless operation and has no impact on the internal state of this operator.
-   * Thus, this is not an accumulating update and is independent of the {@link #setA(Sketch)},
-   * {@link #notB(Sketch)}, {@link #notB(org.apache.datasketches.theta.ThetaSketch)}, and
+   * Thus, this is not an accumulating update and is independent of the {@link #setA(TupleSketch)},
+   * {@link #notB(TupleSketch)}, {@link #notB(ThetaSketch)}, and
    * {@link #getResult(boolean)} methods.
    
    *
    * 
    If either argument is null an exception is thrown.
    
@@ -397,16 +399,16 @@ public static  CompactSketch aNotB(
    * Since it is very likely that a null is a programming error for either argument
    * we throw a an exception.
    
    *
-   * @param skA The incoming Tuple sketch for the first argument
-   * @param skB The incoming Theta sketch for the second argument
+   * @param skA The incoming TupleSketch for the first argument
+   * @param skB The incoming ThetaSketch for the second argument
    * @param  Type of Summary
-   * @return the result as an unordered {@link CompactSketch}
+   * @return the result as an unordered {@link CompactTupleSketch}
    */
   @SuppressFBWarnings(value = "UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR",
       justification = "hashArr and summaryArr are guaranteed to be valid due to the switch on CornerCase")
-  public static  CompactSketch aNotB(
-      final Sketch skA,
-      final org.apache.datasketches.theta.ThetaSketch skB) {
+  public static  CompactTupleSketch aNotB(
+      final TupleSketch skA,
+      final ThetaSketch skB) {
     if (skA == null || skB == null) {
       throw new SketchesArgumentException("Neither argument may be null for this stateless operation.");
     }
@@ -424,20 +426,20 @@ public static  CompactSketch aNotB(
     final CornerCase cCase = CornerCase.caseIdToCornerCase(id);
     final AnotbAction anotbAction = cCase.getAnotbAction();
 
-    CompactSketch result = null;
+    CompactTupleSketch result = null;
 
     switch (anotbAction) {
       case EMPTY_1_0_T: {
-        result = new CompactSketch<>(null, null, Long.MAX_VALUE, true);
+        result = new CompactTupleSketch<>(null, null, Long.MAX_VALUE, true);
         break;
       }
       case DEGEN_MIN_0_F: {
         final long thetaLong = min(thetaLongA, thetaLongB);
-        result = new CompactSketch<>(null, null, thetaLong, false);
+        result = new CompactTupleSketch<>(null, null, thetaLong, false);
         break;
       }
       case DEGEN_THA_0_F: {
-        result = new CompactSketch<>(null, null, thetaLongA, false);
+        result = new CompactTupleSketch<>(null, null, thetaLongA, false);
         break;
       }
       case TRIM_A: {
@@ -446,12 +448,12 @@ public static  CompactSketch aNotB(
         final S[] summaryArrA = daA.summaryArr;
         final long minThetaLong = min(thetaLongA, thetaLongB);
         final DataArrays da = trimAndCopyDataArrays(hashArrA, summaryArrA, minThetaLong, false);
-        result = new CompactSketch<>(da.hashArr, da.summaryArr, minThetaLong, skA.empty_);
+        result = new CompactTupleSketch<>(da.hashArr, da.summaryArr, minThetaLong, skA.empty_);
         break;
       }
       case SKETCH_A: {
         final DataArrays daA = getCopyOfDataArraysTuple(skA);
-        result = new CompactSketch<>(daA.hashArr, daA.summaryArr, thetaLongA, skA.empty_);
+        result = new CompactTupleSketch<>(daA.hashArr, daA.summaryArr, thetaLongA, skA.empty_);
         break;
       }
       case FULL_ANOTB: { //both A and B have valid entries.
@@ -463,9 +465,9 @@ public static  CompactSketch aNotB(
             getCopyOfResultArraysTheta(minThetaLong, daA.hashArr.length, daA.hashArr, daA.summaryArr, skB);
         final int countR = (daR.hashArr == null) ? 0 : daR.hashArr.length;
         if (countR == 0) {
-          result = new CompactSketch<>(null, null, minThetaLong, minThetaLong == Long.MAX_VALUE);
+          result = new CompactTupleSketch<>(null, null, minThetaLong, minThetaLong == Long.MAX_VALUE);
         } else {
-          result = new CompactSketch<>(daR.hashArr, daR.summaryArr, minThetaLong, false);
+          result = new CompactTupleSketch<>(daR.hashArr, daR.summaryArr, minThetaLong, false);
         }
       }
       //default: not possible
@@ -483,11 +485,11 @@ static class DataArrays {
   }
 
   private static  DataArrays getCopyOfDataArraysTuple(
-      final Sketch sk) {
-    final CompactSketch csk;
+      final TupleSketch sk) {
+    final CompactTupleSketch csk;
     final DataArrays da = new DataArrays<>();
-    if (sk instanceof CompactSketch) {
-      csk = (CompactSketch) sk;
+    if (sk instanceof CompactTupleSketch) {
+      csk = (CompactTupleSketch) sk;
     } else {
       csk = ((QuickSelectSketch)sk).compact();
     }
@@ -509,14 +511,14 @@ private static  DataArrays getCopyOfResultArraysTuple(
       final int countA,
       final long[] hashArrA,
       final S[] summaryArrA,
-      final Sketch skB) {
+      final TupleSketch skB) {
     final DataArrays daR = new DataArrays<>();
 
     //Rebuild/get hashtable of skB
     final long[] hashTableB;
 
-    if (skB instanceof CompactSketch) {
-      final CompactSketch cskB = (CompactSketch) skB;
+    if (skB instanceof CompactTupleSketch) {
+      final CompactTupleSketch cskB = (CompactTupleSketch) skB;
       final int countB = skB.getRetainedEntries();
       hashTableB = convertToHashTable(cskB.getHashArr(), countB, minThetaLong, ThetaUtil.REBUILD_THRESHOLD);
     } else {
@@ -553,7 +555,7 @@ private static  DataArrays getCopyOfResultArraysTheta(
       final int countA,
       final long[] hashArrA,
       final S[] summaryArrA,
-      final org.apache.datasketches.theta.ThetaSketch skB) {
+      final ThetaSketch skB) {
     final DataArrays daB = new DataArrays<>();
 
     //Rebuild/get hashtable of skB
@@ -563,7 +565,7 @@ private static  DataArrays getCopyOfResultArraysTheta(
     try { hashCacheB = (long[])GET_CACHE.invoke(skB);
     } catch (final Exception e) { throw new SketchesStateException("Reflection Exception " + e); }
 
-    if (skB instanceof org.apache.datasketches.theta.CompactThetaSketch) {
+    if (skB instanceof CompactThetaSketch) {
       final int countB = skB.getRetainedEntries(true);
       hashTableB = convertToHashTable(hashCacheB, countB, minThetaLong, ThetaUtil.REBUILD_THRESHOLD);
     } else {
diff --git a/src/main/java/org/apache/datasketches/tuple/Intersection.java b/src/main/java/org/apache/datasketches/tuple/TupleIntersection.java
similarity index 76%
rename from src/main/java/org/apache/datasketches/tuple/Intersection.java
rename to src/main/java/org/apache/datasketches/tuple/TupleIntersection.java
index 6467ad055..0ddbbf294 100644
--- a/src/main/java/org/apache/datasketches/tuple/Intersection.java
+++ b/src/main/java/org/apache/datasketches/tuple/TupleIntersection.java
@@ -26,12 +26,13 @@
 
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.SketchesStateException;
+import org.apache.datasketches.theta.ThetaSketch;
 import org.apache.datasketches.thetacommon.ThetaUtil;
 
 
 /**
- * Computes an intersection of two or more generic tuple sketches or generic tuple sketches
- * combined with theta sketches.
+ * Computes an intersection of two or more generic TupleSketches or generic TupleSketches
+ * combined with ThetaSketches.
  * A new instance represents the Universal Set. Because the Universal Set
  * cannot be realized a getResult() on a new instance will produce an error.
  * Every update() computes an intersection with the internal state, which will never
@@ -40,7 +41,7 @@
  * @param  Type of Summary
  */
 @SuppressWarnings("unchecked")
-public class Intersection {
+public class TupleIntersection {
   private final SummarySetOperations summarySetOps_;
   private boolean empty_;
   private long thetaLong_;
@@ -48,11 +49,10 @@ public class Intersection {
   private boolean firstCall_;
 
   /**
-   * Creates new Intersection instance with instructions on how to process two summaries that
-   * intersect.
+   * Creates new TupleIntersection instance with instructions on how to process two summaries that intersect.
    * @param summarySetOps instance of SummarySetOperations
    */
-  public Intersection(final SummarySetOperations summarySetOps) {
+  public TupleIntersection(final SummarySetOperations summarySetOps) {
     summarySetOps_ = summarySetOps;
     empty_ = false; // universal set at the start
     thetaLong_ = Long.MAX_VALUE;
@@ -61,50 +61,49 @@ public Intersection(final SummarySetOperations summarySetOps) {
   }
 
   /**
-   * Perform a stateless intersect set operation on the two given tuple sketches and returns the
-   * result as an unordered CompactSketch on the heap.
+   * Perform a stateless intersect set operation on the two given TupleSketches and returns the
+   * result as an unordered CompactTupleSketch on the heap.
    * @param tupleSketchA The first sketch argument.  It must not be null.
    * @param tupleSketchB The second sketch argument.  It must not be null.
-   * @return an unordered CompactSketch on the heap
+   * @return an unordered CompactTupleSketch on the heap
    */
-  public CompactSketch intersect(
-      final Sketch tupleSketchA,
-      final Sketch tupleSketchB) {
+  public CompactTupleSketch intersect(
+      final TupleSketch tupleSketchA,
+      final TupleSketch tupleSketchB) {
     reset();
     intersect(tupleSketchA);
     intersect(tupleSketchB);
-    final CompactSketch csk = getResult();
+    final CompactTupleSketch csk = getResult();
     reset();
     return csk;
   }
 
   /**
-   * Perform a stateless intersect set operation on a tuple sketch and a theta sketch and returns the
-   * result as an unordered CompactSketch on the heap.
+   * Perform a stateless intersect set operation on a TupleSketch and a ThetaSketch and returns the
+   * result as an unordered CompactTupleSketch on the heap.
    * @param tupleSketch The first sketch argument. It must not be null.
    * @param thetaSketch The second sketch argument. It must not be null.
-   * @param summary the given proxy summary for the theta sketch, which doesn't have one.
+   * @param summary the given proxy summary for the ThetaSketch, which doesn't have one.
    * This must not be null.
-   * @return an unordered CompactSketch on the heap
+   * @return an unordered CompactTupleSketch on the heap
    */
-  public CompactSketch intersect(
-      final Sketch tupleSketch,
-      final org.apache.datasketches.theta.ThetaSketch
-      thetaSketch, final S summary) {
+  public CompactTupleSketch intersect(
+      final TupleSketch tupleSketch,
+      final ThetaSketch thetaSketch, final S summary) {
     reset();
     intersect(tupleSketch);
     intersect(thetaSketch, summary);
-    final CompactSketch csk = getResult();
+    final CompactTupleSketch csk = getResult();
     reset();
     return csk;
   }
 
   /**
-   * Performs a stateful intersection of the internal set with the given tupleSketch.
+   * Performs a stateful intersection of the internal set with the given TupleSketch.
    * @param tupleSketch input sketch to intersect with the internal state. It must not be null.
    */
-  public void intersect(final Sketch tupleSketch) {
-    if (tupleSketch == null) { throw new SketchesArgumentException("Sketch must not be null"); }
+  public void intersect(final TupleSketch tupleSketch) {
+    if (tupleSketch == null) { throw new SketchesArgumentException("TupleSketch must not be null"); }
 
     final boolean firstCall = firstCall_;
     firstCall_ = false;
@@ -141,15 +140,15 @@ public void intersect(final Sketch tupleSketch) {
   }
 
   /**
-   * Performs a stateful intersection of the internal set with the given thetaSketch by combining entries
-   * using the hashes from the theta sketch and summary values from the given summary and rules
-   * from the summarySetOps defined by the Intersection constructor.
-   * @param thetaSketch input theta sketch to intersect with the internal state. It must not be null.
+   * Performs a stateful intersection of the internal set with the given ThetaSketch by combining entries
+   * using the hashes from the ThetaSketch and summary values from the given summary and rules
+   * from the summarySetOps defined by the TupleIntersection constructor.
+   * @param thetaSketch input ThetaSketch to intersect with the internal state. It must not be null.
    * @param summary the given proxy summary for the theta sketch, which doesn't have one.
    * It will be copied for each matching index. It must not be null.
    */
-  public void intersect(final org.apache.datasketches.theta.ThetaSketch thetaSketch, final S summary) {
-    if (thetaSketch == null) { throw new SketchesArgumentException("Sketch must not be null"); }
+  public void intersect(final ThetaSketch thetaSketch, final S summary) {
+    if (thetaSketch == null) { throw new SketchesArgumentException("ThetaSketch must not be null"); }
     if (summary == null) { throw new SketchesArgumentException("Summary cannot be null."); }
     final boolean firstCall = firstCall_;
     firstCall_ = false;
@@ -173,7 +172,7 @@ public void intersect(final org.apache.datasketches.theta.ThetaSketch thetaSketc
     // input sketch will have valid entries > 0
 
     if (firstCall) {
-      final org.apache.datasketches.theta.ThetaSketch firstSketch = thetaSketch;
+      final ThetaSketch firstSketch = thetaSketch;
       //Copy firstSketch data into local instance hashTables_
       hashTables_.fromSketch(firstSketch, summary);
     }
@@ -186,17 +185,17 @@ public void intersect(final org.apache.datasketches.theta.ThetaSketch thetaSketc
   }
 
   /**
-   * Gets the internal set as an unordered CompactSketch
+   * Gets the internal set as an unordered CompactTupleSketch
    * @return result of the intersections so far
    */
-  public CompactSketch getResult() {
+  public CompactTupleSketch getResult() {
     if (firstCall_) {
       throw new SketchesStateException(
         "getResult() with no intervening intersections is not a legal result.");
     }
     final int countIn = hashTables_.numKeys;
     if (countIn == 0) {
-      return new CompactSketch<>(null, null, thetaLong_, empty_);
+      return new CompactTupleSketch<>(null, null, thetaLong_, empty_);
     }
 
     final int tableSize = hashTables_.hashTable.length;
@@ -214,7 +213,7 @@ public CompactSketch getResult() {
       cnt++;
     }
     assert cnt == countIn;
-    return new CompactSketch<>(hashArr, summaryArr, thetaLong_, empty_);
+    return new CompactTupleSketch<>(hashArr, summaryArr, thetaLong_, empty_);
   }
 
   /**
diff --git a/src/main/java/org/apache/datasketches/tuple/Sketch.java b/src/main/java/org/apache/datasketches/tuple/TupleSketch.java
similarity index 73%
rename from src/main/java/org/apache/datasketches/tuple/Sketch.java
rename to src/main/java/org/apache/datasketches/tuple/TupleSketch.java
index 8fd81f78c..7ef2ebc06 100644
--- a/src/main/java/org/apache/datasketches/tuple/Sketch.java
+++ b/src/main/java/org/apache/datasketches/tuple/TupleSketch.java
@@ -21,15 +21,20 @@
 
 import static org.apache.datasketches.common.Util.LS;
 
+import java.lang.foreign.MemorySegment;
+
 import org.apache.datasketches.thetacommon.BinomialBoundsN;
 
 /**
- * This is an equivalent to org.apache.datasketches.theta2.Sketch with
+ * The top-level class for all Tuple sketches. This class is never constructed directly.
+ * Use the UpdatableTupleSketchBuilder() methods to create UpdatableTupleSketches.
+ * This is similar to {@link org.apache.datasketches.theta.ThetaSketch ThetaSketch} with
  * addition of a user-defined Summary object associated with every unique entry
  * in the sketch.
  * @param  Type of Summary
  */
-public abstract class Sketch {
+@SuppressWarnings("deprecation")
+public abstract class TupleSketch {
 
   protected static final byte PREAMBLE_LONGS = 1;
 
@@ -37,20 +42,20 @@ public abstract class Sketch {
   boolean empty_ = true;
   protected SummaryFactory summaryFactory_ = null;
 
-  Sketch(final long thetaLong, final boolean empty, final SummaryFactory summaryFactory) {
+  TupleSketch(final long thetaLong, final boolean empty, final SummaryFactory summaryFactory) {
     this.thetaLong_ = thetaLong;
     this.empty_ = empty;
     this.summaryFactory_ = summaryFactory;
   }
 
   /**
-   * Converts this sketch to a CompactSketch on the Java heap.
+   * Converts this TupleSketch to a CompactTupleSketch on the Java heap.
    *
    * 
    If this sketch is already in compact form this operation returns this.
    *
-   * @return this sketch as a CompactSketch on the Java heap.
+   * @return this sketch as a CompactTupleSketch on the Java heap.
    */
-  public abstract CompactSketch compact();
+  public abstract CompactTupleSketch compact();
 
   /**
    * Estimates the cardinality of the set (number of unique values presented to the sketch)
@@ -152,7 +157,7 @@ public boolean isEstimationMode() {
 
   /**
    * Gets the number of hash values less than the given theta expressed as a long.
-   * @param thetaLong the given theta as a long between zero and Long.MAX_VALUE.
+   * @param thetaLong the given theta as a long in the range (zero, Long.MAX_VALUE].
    * @return the number of hash values less than the given thetaLong.
    */
   public abstract int getCountLessThanThetaLong(final long thetaLong);
@@ -174,12 +179,12 @@ public double getTheta() {
   }
 
   /**
-   * This is to serialize a sketch instance to a byte array.
+   * Serialize this sketch to a byte array.
    *
-   * 
    As of 3.0.0, serializing an UpdatableSketch is deprecated.
+   * 
    As of 3.0.0, serializing an UpdatableTupleSketch is deprecated.
    * This capability will be removed in a future release.
-   * Serializing a CompactSketch is not deprecated.
    
-   * @return serialized representation of the sketch
+   * Serializing a CompactTupleSketch is not deprecated.
    
+   * @return serialized representation of this sketch.
    */
   public abstract byte[] toByteArray();
 
@@ -209,9 +214,9 @@ public String toString() {
     sb.append("   EstMode?                : ").append(isEstimationMode()).append(LS);
     sb.append("   Empty?                  : ").append(isEmpty()).append(LS);
     sb.append("   Retained Entries        : ").append(this.getRetainedEntries()).append(LS);
-    if (this instanceof UpdatableSketch) {
+    if (this instanceof UpdatableTupleSketch) {
       @SuppressWarnings("rawtypes")
-      final UpdatableSketch updatable = (UpdatableSketch) this;
+      final UpdatableTupleSketch updatable = (UpdatableTupleSketch) this;
       sb.append("   Nominal Entries (k)     : ").append(updatable.getNominalEntries()).append(LS);
       sb.append("   Current Capacity        : ").append(updatable.getCurrentCapacity()).append(LS);
       sb.append("   Resize Factor           : ").append(updatable.getResizeFactor().getValue()).append(LS);
@@ -221,4 +226,46 @@ public String toString() {
     return sb.toString();
   }
 
+  /**
+   * Instantiate an UpdatableTupleSketch from a given MemorySegment on the heap,
+   * @param  Type of update value
+   * @param  Type of Summary
+   * @param seg MemorySegment object representing an UpdatableTupleSketch
+   * @param deserializer instance of SummaryDeserializer
+   * @param summaryFactory instance of SummaryFactory
+   * @return UpdatableTupleSketch created from its MemorySegment representation
+   */
+  public static > UpdatableTupleSketch heapifyUpdatableSketch(
+      final MemorySegment seg,
+      final SummaryDeserializer deserializer,
+      final SummaryFactory summaryFactory) {
+    return new UpdatableTupleSketch<>(seg, deserializer, summaryFactory);
+  }
+
+  /**
+   * Instantiate a TupleSketch from a given MemorySegment.
+   * @param  Type of Summary
+   * @param seg MemorySegment object representing a TupleSketch
+   * @param deserializer instance of SummaryDeserializer
+   * @return TupleSketch created from its MemorySegment representation
+   */
+  public static  TupleSketch heapifySketch(
+      final MemorySegment seg,
+      final SummaryDeserializer deserializer) {
+    final SerializerDeserializer.SketchType sketchType = SerializerDeserializer.getSketchType(seg);
+    if (sketchType == SerializerDeserializer.SketchType.QuickSelectSketch) {
+      return new QuickSelectSketch<>(seg, deserializer, null);
+    }
+    return new CompactTupleSketch<>(seg, deserializer);
+  }
+
+  /**
+   * Creates an empty CompactTupleSketch.
+   * @param  Type of Summary
+   * @return an empty instance of a CompactTupleSketch
+   */
+  public static  TupleSketch createEmptySketch() {
+    return new CompactTupleSketch<>(null, null, Long.MAX_VALUE, true);
+  }
+
 }
diff --git a/src/main/java/org/apache/datasketches/tuple/Union.java b/src/main/java/org/apache/datasketches/tuple/TupleUnion.java
similarity index 83%
rename from src/main/java/org/apache/datasketches/tuple/Union.java
rename to src/main/java/org/apache/datasketches/tuple/TupleUnion.java
index 593c944cb..d624c017a 100644
--- a/src/main/java/org/apache/datasketches/tuple/Union.java
+++ b/src/main/java/org/apache/datasketches/tuple/TupleUnion.java
@@ -23,6 +23,8 @@
 
 import org.apache.datasketches.common.QuickSelect;
 import org.apache.datasketches.common.SketchesArgumentException;
+import org.apache.datasketches.theta.HashIterator;
+import org.apache.datasketches.theta.ThetaSketch;
 import org.apache.datasketches.thetacommon.ThetaUtil;
 
 /**
@@ -30,28 +32,28 @@
  * ThetaSketches. A new instance represents an empty set.
  * @param  Type of Summary
  */
-public class Union {
+public class TupleUnion {
   private final SummarySetOperations summarySetOps_;
   private QuickSelectSketch qsk_;
   private long unionThetaLong_; // need to maintain outside of the sketch
   private boolean empty_;
 
   /**
-   * Creates new Union instance with instructions on how to process two summaries that
+   * Creates new TupleUnion instance with instructions on how to process two summaries that
    * overlap. This will have the default nominal entries (K).
    * @param summarySetOps instance of SummarySetOperations
    */
-  public Union(final SummarySetOperations summarySetOps) {
+  public TupleUnion(final SummarySetOperations summarySetOps) {
     this(ThetaUtil.DEFAULT_NOMINAL_ENTRIES, summarySetOps);
   }
 
   /**
-   * Creates new Union instance.
+   * Creates new TupleUnion instance.
    * @param nomEntries nominal entries (K). Forced to the nearest power of 2 greater than
    * given value.
    * @param summarySetOps instance of SummarySetOperations
    */
-  public Union(final int nomEntries, final SummarySetOperations summarySetOps) {
+  public TupleUnion(final int nomEntries, final SummarySetOperations summarySetOps) {
     summarySetOps_ = summarySetOps;
     qsk_ = new QuickSelectSketch<>(nomEntries, null);
     unionThetaLong_ = qsk_.getThetaLong();
@@ -66,13 +68,13 @@ public Union(final int nomEntries, final SummarySetOperations summarySetOps)
    *
    * @param tupleSketchA The first argument
    * @param tupleSketchB The second argument
-   * @return the result ordered CompactSketch on the heap.
+   * @return the result ordered CompactTupleSketch on the heap.
    */
-  public CompactSketch union(final Sketch tupleSketchA, final Sketch tupleSketchB) {
+  public CompactTupleSketch union(final TupleSketch tupleSketchA, final TupleSketch tupleSketchB) {
     reset();
     union(tupleSketchA);
     union(tupleSketchB);
-    final CompactSketch csk = getResult(true);
+    final CompactTupleSketch csk = getResult(true);
     return csk;
   }
 
@@ -86,14 +88,14 @@ public CompactSketch union(final Sketch tupleSketchA, final Sketch tupl
    * @param thetaSketch The second argument
    * @param summary the given proxy summary for the ThetaSketch, which doesn't have one.
    * This may not be null.
-   * @return the result ordered CompactSketch on the heap.
+   * @return the result ordered CompactTupleSketch on the heap.
    */
-  public CompactSketch union(final Sketch tupleSketch,
-      final org.apache.datasketches.theta.ThetaSketch thetaSketch, final S summary) {
+  public CompactTupleSketch union(final TupleSketch tupleSketch,
+      final ThetaSketch thetaSketch, final S summary) {
     reset();
     union(tupleSketch);
     union(thetaSketch, summary);
-    final CompactSketch csk = getResult(true);
+    final CompactTupleSketch csk = getResult(true);
     return csk;
   }
 
@@ -102,7 +104,7 @@ public CompactSketch union(final Sketch tupleSketch,
    * @param tupleSketch input tuple sketch to merge with the internal set.
    * Nulls and empty sketches are ignored.
    */
-  public void union(final Sketch tupleSketch) {
+  public void union(final TupleSketch tupleSketch) {
     if (tupleSketch == null || tupleSketch.isEmpty()) { return; }
     empty_ = false;
     unionThetaLong_ = min(tupleSketch.thetaLong_, unionThetaLong_);
@@ -120,14 +122,14 @@ public void union(final Sketch tupleSketch) {
    * @param summary the given proxy summary for the ThetaSketch, which doesn't have one. This may
    * not be null.
    */
-  public void union(final org.apache.datasketches.theta.ThetaSketch thetaSketch, final S summary) {
+  public void union(final ThetaSketch thetaSketch, final S summary) {
     if (summary == null) {
       throw new SketchesArgumentException("Summary cannot be null."); }
     if (thetaSketch == null || thetaSketch.isEmpty()) { return; }
     empty_ = false;
     final long thetaIn = thetaSketch.getThetaLong();
     unionThetaLong_ = min(thetaIn, unionThetaLong_);
-    final org.apache.datasketches.theta.HashIterator it = thetaSketch.iterator();
+    final HashIterator it = thetaSketch.iterator();
     while (it.next()) {
       qsk_.merge(it.get(), summary, summarySetOps_); //copies summary
     }
@@ -135,23 +137,23 @@ public void union(final org.apache.datasketches.theta.ThetaSketch thetaSketch, f
   }
 
   /**
-   * Gets the result of a sequence of stateful union operations as an unordered CompactSketch
+   * Gets the result of a sequence of stateful union operations as an unordered CompactTupleSketch
    * @return result of the stateful unions so far. The state of this operation is not reset after the
    * result is returned.
    */
-  public CompactSketch getResult() {
+  public CompactTupleSketch getResult() {
     return getResult(false);
   }
 
   /**
-   * Gets the result of a sequence of stateful union operations as an unordered CompactSketch.
+   * Gets the result of a sequence of stateful union operations as an unordered CompactTupleSketch.
    * @param reset If true, clears this operator to the empty state after this result is
    * returned. Set this to false if you wish to obtain an intermediate result.
    * @return result of the stateful union
    */
   @SuppressWarnings("unchecked")
-  public CompactSketch getResult(final boolean reset) {
-    final CompactSketch result;
+  public CompactTupleSketch getResult(final boolean reset) {
+    final CompactTupleSketch result;
     if (empty_) {
       result = qsk_.compact();
     } else if (unionThetaLong_ >= qsk_.thetaLong_ && qsk_.getRetainedEntries() <= qsk_.getNominalEntries()) {
@@ -171,7 +173,7 @@ public CompactSketch getResult(final boolean reset) {
       if (numHashesIn == 0) {
         //numHashes == 0 && empty == false means Theta < 1.0
         //Therefore, this is a degenerate sketch: theta < 1.0, count = 0, empty = false
-        result = new CompactSketch<>(null, null, tmpThetaLong, empty_);
+        result = new CompactTupleSketch<>(null, null, tmpThetaLong, empty_);
       }
 
       else {
@@ -206,7 +208,7 @@ public CompactSketch getResult(final boolean reset) {
             i++;
           }
         }
-        result = new CompactSketch<>(hashArr, summaries, thetaLongOut, empty_);
+        result = new CompactTupleSketch<>(hashArr, summaries, thetaLongOut, empty_);
       }
     }
     if (reset) { reset(); }
diff --git a/src/main/java/org/apache/datasketches/tuple/UpdatableSketch.java b/src/main/java/org/apache/datasketches/tuple/UpdatableTupleSketch.java
similarity index 90%
rename from src/main/java/org/apache/datasketches/tuple/UpdatableSketch.java
rename to src/main/java/org/apache/datasketches/tuple/UpdatableTupleSketch.java
index b706ca11e..45bc88dcd 100644
--- a/src/main/java/org/apache/datasketches/tuple/UpdatableSketch.java
+++ b/src/main/java/org/apache/datasketches/tuple/UpdatableTupleSketch.java
@@ -36,11 +36,11 @@
  * any kind of user-defined accumulation is possible. Summaries also must know
  * how to copy themselves. Also union and intersection of summaries can be
  * implemented in a sub-class of SummarySetOperations, which will be used in
- * case Union or Intersection of two instances of Tuple Sketch is needed
+ * case TupleUnion or TupleIntersection of two instances of TupleSketch is needed
  * @param  Type of the value, which is passed to update method of a Summary
  * @param  Type of the UpdatableSummary<U>
  */
-public class UpdatableSketch> extends QuickSelectSketch {
+public class UpdatableTupleSketch> extends QuickSelectSketch {
 
   /**
    * This is to create a new instance of an UpdatableQuickSelectSketch.
@@ -57,22 +57,22 @@ public class UpdatableSketch> extends QuickSele
    * See Sampling Probability
    * @param summaryFactory An instance of a SummaryFactory.
    */
-  public UpdatableSketch(final int nomEntries, final int lgResizeFactor,
+  public UpdatableTupleSketch(final int nomEntries, final int lgResizeFactor,
       final float samplingProbability, final SummaryFactory summaryFactory) {
     super(nomEntries, lgResizeFactor, samplingProbability, summaryFactory);
   }
 
   /**
-   * This is to create an instance of a sketch given a serialized form
-   * @param srcSeg MemorySegment object with data of a serialized UpdatableSketch
+   * This is to create an instance of an UpdatableTupleSketch given a serialized form
+   * @param srcSeg MemorySegment object with data of a serialized UpdatableTupleSketch
    * @param deserializer instance of SummaryDeserializer
    * @param summaryFactory instance of SummaryFactory
-   * @deprecated As of 3.0.0, heapifying an UpdatableSketch is deprecated.
+   * @deprecated As of 3.0.0, heapifying an UpdatableTupleSketch is deprecated.
    * This capability will be removed in a future release.
-   * Heapifying a CompactSketch is not deprecated.
+   * Heapifying a CompactTupleSketch is not deprecated.
    */
   @Deprecated
-  public UpdatableSketch(
+  public UpdatableTupleSketch(
       final MemorySegment srcSeg,
       final SummaryDeserializer deserializer,
       final SummaryFactory summaryFactory) {
@@ -83,7 +83,7 @@ public UpdatableSketch(
    * Copy Constructor
    * @param sketch the sketch to copy
    */
-  public UpdatableSketch(final UpdatableSketch sketch) {
+  public UpdatableTupleSketch(final UpdatableTupleSketch sketch) {
     super(sketch);
   }
 
@@ -91,8 +91,8 @@ public UpdatableSketch(final UpdatableSketch sketch) {
    * @return a deep copy of this sketch
    */
   @Override
-  public UpdatableSketch copy() {
-    return new UpdatableSketch<>(this);
+  public UpdatableTupleSketch copy() {
+    return new UpdatableTupleSketch<>(this);
   }
 
   /**
diff --git a/src/main/java/org/apache/datasketches/tuple/UpdatableSketchBuilder.java b/src/main/java/org/apache/datasketches/tuple/UpdatableTupleSketchBuilder.java
similarity index 75%
rename from src/main/java/org/apache/datasketches/tuple/UpdatableSketchBuilder.java
rename to src/main/java/org/apache/datasketches/tuple/UpdatableTupleSketchBuilder.java
index 4618b18b9..e83862772 100644
--- a/src/main/java/org/apache/datasketches/tuple/UpdatableSketchBuilder.java
+++ b/src/main/java/org/apache/datasketches/tuple/UpdatableTupleSketchBuilder.java
@@ -24,11 +24,11 @@
 import org.apache.datasketches.thetacommon.ThetaUtil;
 
 /**
- * For building a new generic tuple UpdatableSketch
+ * For building a new generic tuple UpdatableTupleSketch
  * @param  Type of update value
  * @param  Type of Summary
  */
-public class UpdatableSketchBuilder> {
+public class UpdatableTupleSketchBuilder> {
 
   private int nomEntries_;
   private ResizeFactor resizeFactor_;
@@ -39,10 +39,10 @@ public class UpdatableSketchBuilder> {
   private static final ResizeFactor DEFAULT_RESIZE_FACTOR = ResizeFactor.X8;
 
   /**
-   * Creates an instance of UpdatableSketchBuilder with default parameters
+   * Creates an instance of UpdatableTupleSketchBuilder with default parameters
    * @param summaryFactory An instance of SummaryFactory.
    */
-  public UpdatableSketchBuilder(final SummaryFactory summaryFactory) {
+  public UpdatableTupleSketchBuilder(final SummaryFactory summaryFactory) {
     nomEntries_ = ThetaUtil.DEFAULT_NOMINAL_ENTRIES;
     resizeFactor_ = DEFAULT_RESIZE_FACTOR;
     samplingProbability_ = DEFAULT_SAMPLING_PROBABILITY;
@@ -53,9 +53,9 @@ public UpdatableSketchBuilder(final SummaryFactory summaryFactory) {
    * This is to set the nominal number of entries.
    * @param nomEntries Nominal number of entries. Forced to the nearest power of 2 greater than
    * or equal to the given value.
-   * @return this UpdatableSketchBuilder
+   * @return this UpdatableTupleSketchBuilder
    */
-  public UpdatableSketchBuilder setNominalEntries(final int nomEntries) {
+  public UpdatableTupleSketchBuilder setNominalEntries(final int nomEntries) {
     nomEntries_ = 1 << ThetaUtil.checkNomLongs(nomEntries);
     return this;
   }
@@ -65,9 +65,9 @@ public UpdatableSketchBuilder setNominalEntries(final int nomEntries) {
    * Value of X1 means that the maximum capacity is allocated from the start.
    * Default resize factor is X8.
    * @param resizeFactor value of X1, X2, X4 or X8
-   * @return this UpdatableSketchBuilder
+   * @return this UpdatableTupleSketchBuilder
    */
-  public UpdatableSketchBuilder setResizeFactor(final ResizeFactor resizeFactor) {
+  public UpdatableTupleSketchBuilder setResizeFactor(final ResizeFactor resizeFactor) {
     resizeFactor_ = resizeFactor;
     return this;
   }
@@ -76,9 +76,9 @@ public UpdatableSketchBuilder setResizeFactor(final ResizeFactor resizeFac
    * This is to set sampling probability.
    * Default probability is 1.
    * @param samplingProbability sampling probability from 0 to 1
-   * @return this UpdatableSketchBuilder
+   * @return this UpdatableTupleSketchBuilder
    */
-  public UpdatableSketchBuilder setSamplingProbability(final float samplingProbability) {
+  public UpdatableTupleSketchBuilder setSamplingProbability(final float samplingProbability) {
     if ((samplingProbability < 0) || (samplingProbability > 1f)) {
       throw new SketchesArgumentException("sampling probability must be between 0 and 1");
     }
@@ -87,11 +87,11 @@ public UpdatableSketchBuilder setSamplingProbability(final float samplingP
   }
 
   /**
-   * Returns an UpdatableSketch with the current configuration of this Builder.
-   * @return an UpdatableSketch
+   * Returns an UpdatableTupleSketch with the current configuration of this Builder.
+   * @return an UpdatableTupleSketch
    */
-  public UpdatableSketch build() {
-    return new UpdatableSketch<>(nomEntries_, resizeFactor_.lg(), samplingProbability_,
+  public UpdatableTupleSketch build() {
+    return new UpdatableTupleSketch<>(nomEntries_, resizeFactor_.lg(), samplingProbability_,
         summaryFactory_);
   }
 
diff --git a/src/main/java/org/apache/datasketches/tuple/adouble/DoubleSummarySetOperations.java b/src/main/java/org/apache/datasketches/tuple/adouble/DoubleSummarySetOperations.java
index 9a2fdd3df..115706cdd 100644
--- a/src/main/java/org/apache/datasketches/tuple/adouble/DoubleSummarySetOperations.java
+++ b/src/main/java/org/apache/datasketches/tuple/adouble/DoubleSummarySetOperations.java
@@ -31,7 +31,7 @@ public final class DoubleSummarySetOperations implements SummarySetOperations {
+public class DoubleTupleSketch extends UpdatableTupleSketch {
 
   /**
    * Constructs this sketch with given lgK.
@@ -36,7 +36,7 @@ public class DoubleSketch extends UpdatableSketch {
    * See Nominal Entries
    * @param mode The DoubleSummary mode to be used
    */
-  public DoubleSketch(final int lgK, final DoubleSummary.Mode mode) {
+  public DoubleTupleSketch(final int lgK, final DoubleSummary.Mode mode) {
     this(lgK, ResizeFactor.X8.ordinal(), 1.0F, mode);
   }
 
@@ -54,22 +54,22 @@ public DoubleSketch(final int lgK, final DoubleSummary.Mode mode) {
    * See Sampling Probability
    * @param mode The DoubleSummary mode to be used
    */
-  public DoubleSketch(final int lgK, final int lgResizeFactor, final float samplingProbability,
+  public DoubleTupleSketch(final int lgK, final int lgResizeFactor, final float samplingProbability,
       final DoubleSummary.Mode mode) {
     super(1 << lgK, lgResizeFactor, samplingProbability, new DoubleSummaryFactory(mode));
   }
 
   /**
-   * Constructs this sketch from a MemorySegment image, which must be from an DoubleSketch, and
+   * Constructs this sketch from a MemorySegment image, which must be from an DoubleTupleSketch, and
    * usually with data.
    * @param seg the given MemorySegment
    * @param mode The DoubleSummary mode to be used
-   * @deprecated As of 3.0.0, heapifying an UpdatableSketch is deprecated.
+   * @deprecated As of 3.0.0, heapifying an UpdatableTupleSketch is deprecated.
    * This capability will be removed in a future release.
-   * Heapifying a CompactSketch is not deprecated.
+   * Heapifying a CompactTupleSketch is not deprecated.
    */
   @Deprecated
-  public DoubleSketch(final MemorySegment seg, final DoubleSummary.Mode mode) {
+  public DoubleTupleSketch(final MemorySegment seg, final DoubleSummary.Mode mode) {
     super(seg, new DoubleSummaryDeserializer(), new DoubleSummaryFactory(mode));
   }
 
diff --git a/src/main/java/org/apache/datasketches/tuple/aninteger/IntegerSummarySetOperations.java b/src/main/java/org/apache/datasketches/tuple/aninteger/IntegerSummarySetOperations.java
index 351bb3a76..b7c59ad01 100644
--- a/src/main/java/org/apache/datasketches/tuple/aninteger/IntegerSummarySetOperations.java
+++ b/src/main/java/org/apache/datasketches/tuple/aninteger/IntegerSummarySetOperations.java
@@ -33,7 +33,7 @@ public class IntegerSummarySetOperations implements SummarySetOperations {
+public class IntegerTupleSketch extends UpdatableTupleSketch {
 
   /**
    * Constructs this sketch with given lgK.
@@ -36,7 +36,7 @@ public class IntegerSketch extends UpdatableSketch {
    * See Nominal Entries
    * @param mode The IntegerSummary mode to be used
    */
-  public IntegerSketch(final int lgK, final IntegerSummary.Mode mode) {
+  public IntegerTupleSketch(final int lgK, final IntegerSummary.Mode mode) {
     this(lgK, ResizeFactor.X8.ordinal(), 1.0F, mode);
   }
 
@@ -54,22 +54,22 @@ public IntegerSketch(final int lgK, final IntegerSummary.Mode mode) {
    * See Sampling Probability
    * @param mode The IntegerSummary mode to be used
    */
-  public IntegerSketch(final int lgK, final int lgResizeFactor, final float samplingProbability,
+  public IntegerTupleSketch(final int lgK, final int lgResizeFactor, final float samplingProbability,
       final IntegerSummary.Mode mode) {
     super(1 << lgK, lgResizeFactor, samplingProbability, new IntegerSummaryFactory(mode));
   }
 
   /**
-   * Constructs this sketch from a MemorySegment image, which must be from an IntegerSketch, and
+   * Constructs this sketch from a MemorySegment image, which must be from an IntegerTupleSketch, and
    * usually with data.
    * @param seg the given MemorySegment
    * @param mode The IntegerSummary mode to be used
-   * @deprecated As of 3.0.0, heapifying an UpdatableSketch is deprecated.
+   * @deprecated As of 3.0.0, heapifying an UpdatableTupleSketch is deprecated.
    * This capability will be removed in a future release.
-   * Heapifying a CompactSketch is not deprecated.
+   * Heapifying a CompactTupleSketch is not deprecated.
    */
   @Deprecated
-  public IntegerSketch(final MemorySegment seg, final IntegerSummary.Mode mode) {
+  public IntegerTupleSketch(final MemorySegment seg, final IntegerSummary.Mode mode) {
     super(seg, new IntegerSummaryDeserializer(), new IntegerSummaryFactory(mode));
   }
 
diff --git a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesAnotBImpl.java b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesAnotBImpl.java
index 8d98b8e3a..bec533a04 100644
--- a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesAnotBImpl.java
+++ b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesAnotBImpl.java
@@ -33,9 +33,9 @@
 import org.apache.datasketches.common.SuppressFBWarnings;
 import org.apache.datasketches.common.Util;
 import org.apache.datasketches.thetacommon.SetOperationCornerCases;
-import org.apache.datasketches.thetacommon.ThetaUtil;
 import org.apache.datasketches.thetacommon.SetOperationCornerCases.AnotbAction;
 import org.apache.datasketches.thetacommon.SetOperationCornerCases.CornerCase;
+import org.apache.datasketches.thetacommon.ThetaUtil;
 
 /**
  * Computes a set difference, A-AND-NOT-B, of two ArrayOfDoublesSketches.
@@ -43,7 +43,7 @@
  * 
    This class includes a stateless operation as follows:
    
  *
  * 
    
- * CompactSketch csk = anotb.aNotB(ArrayOfDoublesSketch skA, ArrayOfDoublesSketch skB);
+ * CompactTupleSketch csk = anotb.aNotB(ArrayOfDoublesSketch skA, ArrayOfDoublesSketch skB);
  * 
    
  *
  * @author Lee Rhodes
diff --git a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesCompactSketch.java b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesCompactSketch.java
index 5ffac576a..1cf3ac040 100644
--- a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesCompactSketch.java
+++ b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesCompactSketch.java
@@ -22,10 +22,10 @@
 /**
  * Top level compact tuple sketch of type ArrayOfDoubles. Compact sketches are never created
  * directly.  They are created as a result of the compact() method on a QuickSelectSketch
- * or the getResult() method of a set operation like Union, Intersection or AnotB.
- * Compact sketch consists of a compact list (i.e. no intervening spaces) of hash values,
- * corresponding list of double values, and a value for theta. The lists may or may
- * not be ordered. A compact sketch is read-only.
+ * or the getResult() method of a set operation like TupleUnion, TupleIntersection or TupleAnotB.
+ * A CompactTupleSketch consists of a compact list (i.e. no intervening spaces) of hash values,
+ * a corresponding list of double values, and a value for theta. The lists may or may
+ * not be ordered. It is read-only.
  */
 public abstract class ArrayOfDoublesCompactSketch extends ArrayOfDoublesSketch {
 
diff --git a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesIntersection.java b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesIntersection.java
index 7c474ee45..91d51b483 100644
--- a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesIntersection.java
+++ b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesIntersection.java
@@ -58,17 +58,17 @@ public abstract class ArrayOfDoublesIntersection {
   }
 
   /**
-   * Performs a stateful intersection of the internal set with the given tupleSketch.
-   * The given tupleSketch and the internal state must have the same numValues.
+   * Performs a stateful intersection of the internal set with the given TupleSketch.
+   * The given TupleSketch and the internal state must have the same numValues.
    * @param tupleSketch Input sketch to intersect with the internal set.
    * @param combiner Method of combining two arrays of double values
    */
   public void intersect(final ArrayOfDoublesSketch tupleSketch, final ArrayOfDoublesCombiner combiner) {
-    if (tupleSketch == null) { throw new SketchesArgumentException("Sketch must not be null"); }
+    if (tupleSketch == null) { throw new SketchesArgumentException("TupleSketch must not be null"); }
     Util.checkSeedHashes(seedHash_, tupleSketch.getSeedHash());
     if (tupleSketch.numValues_ != numValues_) {
       throw new SketchesArgumentException(
-          "Input tupleSketch cannot have different numValues from the internal numValues.");
+          "Input TupleSketch cannot have different numValues from the internal numValues.");
     }
 
     final boolean isFirstCall = firstCall_;
diff --git a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesSketch.java b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesSketch.java
index b86f5f624..6fb1aacaa 100644
--- a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesSketch.java
+++ b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesSketch.java
@@ -95,7 +95,7 @@ public static ArrayOfDoublesSketch heapify(final MemorySegment seg, final long s
 
   /**
    * Wrap the given MemorySegment as an ArrayOfDoublesSketch.
-   * If the given source MemorySegment is read-only, the returned Union object will also be read-only.
+   * If the given source MemorySegment is read-only, the returned TupleUnion object will also be read-only.
    * @param seg the given MemorySegment
    * @return an ArrayOfDoublesSketch
    */
@@ -105,7 +105,7 @@ public static ArrayOfDoublesSketch wrap(final MemorySegment seg) {
 
   /**
    * Wrap the given MemorySegment and seed as a ArrayOfDoublesSketch.
-   * If the given source MemorySegment is read-only, the returned Union object will also be read-only.
+   * If the given source MemorySegment is read-only, the returned TupleUnion object will also be read-only.
    * @param seg the given MemorySegment
    * @param seed the given seed
    * @return an ArrayOfDoublesSketch
@@ -289,4 +289,126 @@ public String toString() {
     return sb.toString();
   }
 
+   // Convenient static methods to instantiate tuple sketches of type ArrayOfDoubles.
+
+  /**
+   * Wrap the given MemorySegment and seed as an ArrayOfDoublesUnion
+   * If the given source MemorySegment is read-only, the returned TupleUnion object will also be read-only.
+   * @param srcSeg the given source MemorySegment
+   * @param seed the given seed
+   * @return an ArrayOfDoublesUnion
+   */
+  public static ArrayOfDoublesUnion wrapUnion(final MemorySegment srcSeg, final long seed) {
+    return ArrayOfDoublesUnion.wrap(srcSeg, seed);
+  }
+
+  /**
+   * Wrap the given MemorySegment as an ArrayOfDoublesUnion
+   * If the given source MemorySegment is read-only, the returned TupleUnion object will also be read-only.
+   * @param srcSeg the given source MemorySegment
+   * @return an ArrayOfDoublesUnion
+   */
+  public static ArrayOfDoublesUnion wrapUnion(final MemorySegment srcSeg) {
+    return ArrayOfDoublesSketch.wrapUnion(srcSeg, Util.DEFAULT_UPDATE_SEED);
+  }
+
+  /**
+   * Heapify the given MemorySegment and seed as an ArrayOfDoublesUnion
+   * @param srcSeg the given source MemorySegment
+   * @param seed the given seed
+   * @return an ArrayOfDoublesUnion
+   */
+  public static ArrayOfDoublesUnion heapifyUnion(final MemorySegment srcSeg, final long seed) {
+    return ArrayOfDoublesUnion.heapify(srcSeg, seed);
+  }
+
+  /**
+   * Heapify the given MemorySegment as an ArrayOfDoublesUnion
+   * @param srcSeg the given source MemorySegment
+   * @return an ArrayOfDoublesUnion
+   */
+  public static ArrayOfDoublesUnion heapifyUnion(final MemorySegment srcSeg) {
+    return ArrayOfDoublesSketch.heapifyUnion(srcSeg, Util.DEFAULT_UPDATE_SEED);
+  }
+
+  /**
+   * Wrap the given MemorySegment and seed as a ArrayOfDoublesUpdatableSketch.
+   * If the given source MemorySegment is read-only, the returned TupleUnion object will also be read-only.
+   * @param srcSeg the given source MemorySegment
+   * @param seed the given seed
+   * @return an ArrayOfDoublesUpdatableSketch
+   */
+  public static ArrayOfDoublesUpdatableSketch wrapUpdatableSketch(final MemorySegment srcSeg, final long seed) {
+    return ArrayOfDoublesUpdatableSketch.wrap(srcSeg, seed);
+  }
+
+  /**
+   * Wrap the given MemorySegment as an ArrayOfDoublesUpdatableSketch.
+   * If the given source MemorySegment is read-only, the returned TupleUnion object will also be read-only.
+   * @param srcSeg the given source MemorySegment
+   * @return an ArrayOfDoublesUpdatableSketch
+   */
+  public static ArrayOfDoublesUpdatableSketch wrapUpdatableSketch(final MemorySegment srcSeg) {
+    return ArrayOfDoublesSketch.wrapUpdatableSketch(srcSeg, Util.DEFAULT_UPDATE_SEED);
+  }
+
+  /**
+   * Wrap the given MemorySegment and seed as a ArrayOfDoublesSketch.
+   * If the given source MemorySegment is read-only, the returned TupleUnion object will also be read-only.
+   * @param srcSeg the given source MemorySegment
+   * @param seed the given seed
+   * @return an ArrayOfDoublesSketch
+   */
+  public static ArrayOfDoublesSketch wrapSketch(final MemorySegment srcSeg, final long seed) {
+    return wrap(srcSeg, seed);
+  }
+
+  /**
+   * Wrap the given MemorySegment as an ArrayOfDoublesSketch.
+   * If the given source MemorySegment is read-only, the returned TupleUnion object will also be read-only.
+   * @param srcSeg the given source MemorySegment
+   * @return an ArrayOfDoublesSketch
+   */
+  public static ArrayOfDoublesSketch wrapSketch(final MemorySegment srcSeg) {
+    return ArrayOfDoublesSketch.wrapSketch(srcSeg, Util.DEFAULT_UPDATE_SEED);
+  }
+
+  /**
+   * Heapify the given MemorySegment and seed as a ArrayOfDoublesUpdatableSketch
+   * @param srcSeg the given source MemorySegment
+   * @param seed the given seed
+   * @return an ArrayOfDoublesUpdatableSketch
+   */
+  public static ArrayOfDoublesUpdatableSketch heapifyUpdatableSketch(final MemorySegment srcSeg, final long seed) {
+    return ArrayOfDoublesUpdatableSketch.heapify(srcSeg, seed);
+  }
+
+  /**
+   * Heapify the given MemorySegment as an ArrayOfDoublesUpdatableSketch
+   * @param srcSeg the given source MemorySegment
+   * @return an ArrayOfDoublesUpdatableSketch
+   */
+  public static ArrayOfDoublesUpdatableSketch heapifyUpdatableSketch(final MemorySegment srcSeg) {
+    return ArrayOfDoublesSketch.heapifyUpdatableSketch(srcSeg, Util.DEFAULT_UPDATE_SEED);
+  }
+
+  /**
+   * Heapify the given MemorySegment and seed as a ArrayOfDoublesSketch
+   * @param srcSeg the given source MemorySegment
+   * @param seed the given seed
+   * @return an ArrayOfDoublesSketch
+   */
+  public static ArrayOfDoublesSketch heapifySketch(final MemorySegment srcSeg, final long seed) {
+    return heapify(srcSeg, seed);
+  }
+
+  /**
+   * Heapify the given MemorySegment as an ArrayOfDoublesSketch
+   * @param srcSeg the given source MemorySegment
+   * @return an ArrayOfDoublesSketch
+   */
+  public static ArrayOfDoublesSketch heapifySketch(final MemorySegment srcSeg) {
+    return ArrayOfDoublesSketch.heapifySketch(srcSeg, Util.DEFAULT_UPDATE_SEED);
+  }
+
 }
diff --git a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesSketches.java b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesSketches.java
deleted file mode 100644
index 53a145beb..000000000
--- a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesSketches.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.datasketches.tuple.arrayofdoubles;
-
-import java.lang.foreign.MemorySegment;
-
-import org.apache.datasketches.common.Util;
-
-/**
- * Convenient static methods to instantiate tuple sketches of type ArrayOfDoubles.
- */
-public final class ArrayOfDoublesSketches {
-
-  /**
-   * Heapify the given MemorySegment as an ArrayOfDoublesSketch
-   * @param srcSeg the given source MemorySegment
-   * @return an ArrayOfDoublesSketch
-   */
-  public static ArrayOfDoublesSketch heapifySketch(final MemorySegment srcSeg) {
-    return heapifySketch(srcSeg, Util.DEFAULT_UPDATE_SEED);
-  }
-
-  /**
-   * Heapify the given MemorySegment and seed as a ArrayOfDoublesSketch
-   * @param srcSeg the given source MemorySegment
-   * @param seed the given seed
-   * @return an ArrayOfDoublesSketch
-   */
-  public static ArrayOfDoublesSketch heapifySketch(final MemorySegment srcSeg, final long seed) {
-    return ArrayOfDoublesSketch.heapify(srcSeg, seed);
-  }
-
-  /**
-   * Heapify the given MemorySegment as an ArrayOfDoublesUpdatableSketch
-   * @param srcSeg the given source MemorySegment
-   * @return an ArrayOfDoublesUpdatableSketch
-   */
-  public static ArrayOfDoublesUpdatableSketch heapifyUpdatableSketch(final MemorySegment srcSeg) {
-    return heapifyUpdatableSketch(srcSeg, Util.DEFAULT_UPDATE_SEED);
-  }
-
-  /**
-   * Heapify the given MemorySegment and seed as a ArrayOfDoublesUpdatableSketch
-   * @param srcSeg the given source MemorySegment
-   * @param seed the given seed
-   * @return an ArrayOfDoublesUpdatableSketch
-   */
-  public static ArrayOfDoublesUpdatableSketch heapifyUpdatableSketch(final MemorySegment srcSeg, final long seed) {
-    return ArrayOfDoublesUpdatableSketch.heapify(srcSeg, seed);
-  }
-
-  /**
-   * Wrap the given MemorySegment as an ArrayOfDoublesSketch.
-   * If the given source MemorySegment is read-only, the returned Union object will also be read-only.
-   * @param srcSeg the given source MemorySegment
-   * @return an ArrayOfDoublesSketch
-   */
-  public static ArrayOfDoublesSketch wrapSketch(final MemorySegment srcSeg) {
-    return wrapSketch(srcSeg, Util.DEFAULT_UPDATE_SEED);
-  }
-
-  /**
-   * Wrap the given MemorySegment and seed as a ArrayOfDoublesSketch.
-   * If the given source MemorySegment is read-only, the returned Union object will also be read-only.
-   * @param srcSeg the given source MemorySegment
-   * @param seed the given seed
-   * @return an ArrayOfDoublesSketch
-   */
-  public static ArrayOfDoublesSketch wrapSketch(final MemorySegment srcSeg, final long seed) {
-    return ArrayOfDoublesSketch.wrap(srcSeg, seed);
-  }
-
-  /**
-   * Wrap the given MemorySegment as an ArrayOfDoublesUpdatableSketch.
-   * If the given source MemorySegment is read-only, the returned Union object will also be read-only.
-   * @param srcSeg the given source MemorySegment
-   * @return an ArrayOfDoublesUpdatableSketch
-   */
-  public static ArrayOfDoublesUpdatableSketch wrapUpdatableSketch(final MemorySegment srcSeg) {
-    return wrapUpdatableSketch(srcSeg, Util.DEFAULT_UPDATE_SEED);
-  }
-
-  /**
-   * Wrap the given MemorySegment and seed as a ArrayOfDoublesUpdatableSketch.
-   * If the given source MemorySegment is read-only, the returned Union object will also be read-only.
-   * @param srcSeg the given source MemorySegment
-   * @param seed the given seed
-   * @return an ArrayOfDoublesUpdatableSketch
-   */
-  public static ArrayOfDoublesUpdatableSketch wrapUpdatableSketch(final MemorySegment srcSeg, final long seed) {
-    return ArrayOfDoublesUpdatableSketch.wrap(srcSeg, seed);
-  }
-
-  /**
-   * Heapify the given MemorySegment as an ArrayOfDoublesUnion
-   * @param srcSeg the given source MemorySegment
-   * @return an ArrayOfDoublesUnion
-   */
-  public static ArrayOfDoublesUnion heapifyUnion(final MemorySegment srcSeg) {
-    return heapifyUnion(srcSeg, Util.DEFAULT_UPDATE_SEED);
-  }
-
-  /**
-   * Heapify the given MemorySegment and seed as an ArrayOfDoublesUnion
-   * @param srcSeg the given source MemorySegment
-   * @param seed the given seed
-   * @return an ArrayOfDoublesUnion
-   */
-  public static ArrayOfDoublesUnion heapifyUnion(final MemorySegment srcSeg, final long seed) {
-    return ArrayOfDoublesUnion.heapify(srcSeg, seed);
-  }
-
-  /**
-   * Wrap the given MemorySegment as an ArrayOfDoublesUnion
-   * If the given source MemorySegment is read-only, the returned Union object will also be read-only.
-   * @param srcSeg the given source MemorySegment
-   * @return an ArrayOfDoublesUnion
-   */
-  public static ArrayOfDoublesUnion wrapUnion(final MemorySegment srcSeg) {
-    return wrapUnion(srcSeg, Util.DEFAULT_UPDATE_SEED);
-  }
-
-  /**
-   * Wrap the given MemorySegment and seed as an ArrayOfDoublesUnion
-   * If the given source MemorySegment is read-only, the returned Union object will also be read-only.
-   * @param srcSeg the given source MemorySegment
-   * @param seed the given seed
-   * @return an ArrayOfDoublesUnion
-   */
-  public static ArrayOfDoublesUnion wrapUnion(final MemorySegment srcSeg, final long seed) {
-    return ArrayOfDoublesUnion.wrap(srcSeg, seed);
-  }
-
-}
diff --git a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUnion.java b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUnion.java
index 58a907702..2d11551ee 100644
--- a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUnion.java
+++ b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUnion.java
@@ -19,9 +19,9 @@
 
 package org.apache.datasketches.tuple.arrayofdoubles;
 
+import static java.lang.Math.min;
 import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 import static java.lang.foreign.ValueLayout.JAVA_LONG_UNALIGNED;
-import static java.lang.Math.min;
 
 import java.lang.foreign.MemorySegment;
 
@@ -51,7 +51,7 @@ public abstract class ArrayOfDoublesUnion {
   long unionThetaLong_;
 
   /**
-   * Constructs this Union initializing it with the given sketch, which can be on-heap or off-heap.
+   * Constructs this TupleUnion initializing it with the given sketch, which can be on-heap or off-heap.
    * @param sketch the given sketch.
    */
   ArrayOfDoublesUnion(final ArrayOfDoublesQuickSelectSketch sketch) {
@@ -80,7 +80,7 @@ public static ArrayOfDoublesUnion heapify(final MemorySegment srcSeg, final long
 
   /**
    * Wrap the given MemorySegment as an ArrayOfDoublesUnion.
-   * If the given source MemorySegment is read-only, the returned Union object will also be read-only.
+   * If the given source MemorySegment is read-only, the returned TupleUnion object will also be read-only.
    * @param srcSeg the given source MemorySegment
    * @return an ArrayOfDoublesUnion
    */
@@ -90,7 +90,7 @@ public static ArrayOfDoublesUnion wrap(final MemorySegment srcSeg) {
 
   /**
    * Wrap the given MemorySegment and seed as an ArrayOfDoublesUnion.
-   * If the given source MemorySegment is read-only, the returned Union object will also be read-only.
+   * If the given source MemorySegment is read-only, the returned TupleUnion object will also be read-only.
    * @param srcSeg the given source MemorySegment
    * @param seed the given seed
    * @return an ArrayOfDoublesUnion
@@ -101,7 +101,7 @@ public static ArrayOfDoublesUnion wrap(final MemorySegment srcSeg, final long se
 
   /**
    * Updates the union by adding a set of entries from a given sketch, which can be on-heap or off-heap.
-   * Both the given tupleSketch and the internal state of the Union must have the same numValues.
+   * Both the given tupleSketch and the internal state of the TupleUnion must have the same numValues.
    *
    * 
    Nulls and empty sketches are ignored.
    
    *
@@ -171,7 +171,7 @@ public void reset() {
   //      ||    7   |    6   |    5   |    4   |    3    |    2   |    1   |     0              |
   //  0   ||  Seed Hash=0    | #Dbls=0|Flags=0 | SkType  | FamID  | SerVer |  Preamble_Longs    |
   //      ||   15   |   14   |   13   |   12   |   11    |   10   |    9   |     8              |
-  //  1   ||---------------------------Union Theta Long-----------------------------------------|
+  //  1   ||---------------------------TupleUnion Theta Long------------------------------------|
   /**
    * Returns a byte array representation of this object
    * @return a byte array representation of this object
diff --git a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUpdatableSketch.java b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUpdatableSketch.java
index dfeffcc4f..591c67f1f 100644
--- a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUpdatableSketch.java
+++ b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUpdatableSketch.java
@@ -19,8 +19,8 @@
 
 package org.apache.datasketches.tuple.arrayofdoubles;
 
-import static org.apache.datasketches.common.Util.computeSeedHash;
 import static org.apache.datasketches.common.Util.DEFAULT_UPDATE_SEED;
+import static org.apache.datasketches.common.Util.computeSeedHash;
 
 import java.lang.foreign.MemorySegment;
 import java.nio.ByteBuffer;
@@ -62,7 +62,7 @@ public static ArrayOfDoublesUpdatableSketch heapify(final MemorySegment seg, fin
 
   /**
    * Wrap the given MemorySegment as an ArrayOfDoublesUpdatableSketch.
-   * If the given source MemorySegment is read-only, the returned Union object will also be read-only.
+   * If the given source MemorySegment is read-only, the returned TupleUnion object will also be read-only.
    * @param seg the given MemorySegment
    * @return an ArrayOfDoublesUpdatableSketch
    */
@@ -72,7 +72,7 @@ public static ArrayOfDoublesUpdatableSketch wrap(final MemorySegment seg) {
 
   /**
    * Wrap the given MemorySegment and seed as a ArrayOfDoublesUpdatableSketch.
-   * If the given source MemorySegment is read-only, the returned Union object will also be read-only.
+   * If the given source MemorySegment is read-only, the returned TupleUnion object will also be read-only.
    * @param seg the given MemorySegment
    * @param seed the given seed
    * @return an ArrayOfDoublesUpdatableSketch
diff --git a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUpdatableSketchBuilder.java b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUpdatableSketchBuilder.java
index 185186975..c15bb6d3e 100644
--- a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUpdatableSketchBuilder.java
+++ b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUpdatableSketchBuilder.java
@@ -68,7 +68,7 @@ public ArrayOfDoublesUpdatableSketchBuilder setNominalEntries(final int nomEntri
    * Value of X1 means that the maximum capacity is allocated from the start.
    * Default resize factor is X8.
    * @param resizeFactor value of X1, X2, X4 or X8
-   * @return this UpdatableSketchBuilder
+   * @return this UpdatableTupleSketchBuilder
    */
   public ArrayOfDoublesUpdatableSketchBuilder setResizeFactor(final ResizeFactor resizeFactor) {
     resizeFactor_ = resizeFactor;
diff --git a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesCompactSketch.java b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesCompactSketch.java
index 44bb4360f..76883224e 100644
--- a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesCompactSketch.java
+++ b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesCompactSketch.java
@@ -33,7 +33,7 @@
 import org.apache.datasketches.tuple.SerializerDeserializer;
 
 /**
- * Direct Compact Sketch of type ArrayOfDoubles.
+ * Direct CompactTupleSketch of type ArrayOfDoubles.
  *
  * 
    This implementation uses data in a given MemorySegment that is owned and managed by the caller.
  * This MemorySegment can be off-heap, which if managed properly will greatly reduce the need for
diff --git a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesIntersection.java b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesIntersection.java
index 1aa34dbba..74fd2abec 100644
--- a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesIntersection.java
+++ b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesIntersection.java
@@ -22,7 +22,7 @@
 import java.lang.foreign.MemorySegment;
 
 /**
- * Direct Intersection operation for tuple sketches of type ArrayOfDoubles.
+ * Direct TupleIntersection operation for tuple sketches of type ArrayOfDoubles.
  *
  * 
    This implementation uses data in a given MemorySegment that is owned and managed by the caller.
  * This MemorySegment can be off-heap, which if managed properly will greatly reduce the need for
diff --git a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesUnion.java b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesUnion.java
index 0c7242088..5e00b9910 100644
--- a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesUnion.java
+++ b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesUnion.java
@@ -29,7 +29,7 @@
 import org.apache.datasketches.tuple.SerializerDeserializer;
 
 /**
- * Direct Union operation for tuple sketches of type ArrayOfDoubles.
+ * Direct TupleUnion operation for tuple sketches of type ArrayOfDoubles.
  *
  * 
    This implementation uses data in a given MemorySegment that is owned and managed by the caller.
  * This MemorySegment can be off-heap, which if managed properly will greatly reduce the need for
diff --git a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesCompactSketch.java b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesCompactSketch.java
index f0de95ef4..8672014d4 100644
--- a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesCompactSketch.java
+++ b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesCompactSketch.java
@@ -34,7 +34,7 @@
 import org.apache.datasketches.tuple.SerializerDeserializer;
 
 /**
- * The on-heap implementation of tuple Compact Sketch of type ArrayOfDoubles.
+ * The on-heap implementation of CompactTupleSketch of type ArrayOfDoubles.
  */
 final class HeapArrayOfDoublesCompactSketch extends ArrayOfDoublesCompactSketch {
 
diff --git a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesQuickSelectSketch.java b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesQuickSelectSketch.java
index 9891c9809..370d6cb44 100644
--- a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesQuickSelectSketch.java
+++ b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesQuickSelectSketch.java
@@ -210,7 +210,7 @@ int getSerializedSizeBytes() {
   }
 
   //  X/Y: X = Byte index for just AoDQuickSelectSketch
-  //       Y = Byte index when combined with Union Preamble
+  //       Y = Byte index when combined with TupleUnion Preamble
   // Long || Start Byte Adr:
   // Adr:
   // First 16 bytes are preamble from AoDUnion
diff --git a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesUnion.java b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesUnion.java
index 7a9b7fd75..b3f93c60e 100644
--- a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesUnion.java
+++ b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesUnion.java
@@ -28,7 +28,7 @@
 import org.apache.datasketches.tuple.SerializerDeserializer;
 
 /**
- * The on-heap implementation of the Union set operation for tuple sketches of type
+ * The on-heap implementation of the TupleUnion set operation for tuple sketches of type
  * ArrayOfDoubles.
  */
 final class HeapArrayOfDoublesUnion extends ArrayOfDoublesUnion {
diff --git a/src/main/java/org/apache/datasketches/tuple/strings/ArrayOfStringsSketch.java b/src/main/java/org/apache/datasketches/tuple/strings/ArrayOfStringsTupleSketch.java
similarity index 77%
rename from src/main/java/org/apache/datasketches/tuple/strings/ArrayOfStringsSketch.java
rename to src/main/java/org/apache/datasketches/tuple/strings/ArrayOfStringsTupleSketch.java
index 66ba4f96e..6260f0df2 100644
--- a/src/main/java/org/apache/datasketches/tuple/strings/ArrayOfStringsSketch.java
+++ b/src/main/java/org/apache/datasketches/tuple/strings/ArrayOfStringsTupleSketch.java
@@ -24,19 +24,19 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.ResizeFactor;
-import org.apache.datasketches.tuple.UpdatableSketch;
+import org.apache.datasketches.tuple.UpdatableTupleSketch;
 
 /**
- * Extends UpdatableSketch<String[], ArrayOfStringsSummary>
+ * Extends UpdatableTupleSketch<String[], ArrayOfStringsSummary>
  * @author Lee Rhodes
  */
-public class ArrayOfStringsSketch extends UpdatableSketch {
+public class ArrayOfStringsTupleSketch extends UpdatableTupleSketch {
 
   /**
    * Constructs new sketch with default K = 4096 (lgK = 12), default ResizeFactor=X8,
    * and default p = 1.0.
    */
-  public ArrayOfStringsSketch() {
+  public ArrayOfStringsTupleSketch() {
     this(12);
   }
 
@@ -45,7 +45,7 @@ public ArrayOfStringsSketch() {
    * @param lgK Log_base2 of Nominal Entries.
    * See Nominal Entries
    */
-  public ArrayOfStringsSketch(final int lgK) {
+  public ArrayOfStringsTupleSketch(final int lgK) {
     this(lgK, ResizeFactor.X8, 1.0F);
   }
 
@@ -58,20 +58,20 @@ public ArrayOfStringsSketch(final int lgK) {
    * @param p sampling probability
    * See Sampling Probability
    */
-  public ArrayOfStringsSketch(final int lgK, final ResizeFactor rf, final float p) {
+  public ArrayOfStringsTupleSketch(final int lgK, final ResizeFactor rf, final float p) {
     super(1 << lgK, rf.lg(), p, new ArrayOfStringsSummaryFactory());
   }
 
   /**
-   * Constructs this sketch from a MemorySegment image, which must be from an ArrayOfStringsSketch, and
+   * Constructs this sketch from a MemorySegment image, which must be from an ArrayOfStringsTupleSketch, and
    * usually with data.
    * @param seg the given MemorySegment
-   * @deprecated As of 3.0.0, heapifying an UpdatableSketch is deprecated.
+   * @deprecated As of 3.0.0, heapifying an UpdatableTupleSketch is deprecated.
    * This capability will be removed in a future release.
-   * Heapifying a CompactSketch is not deprecated.
+   * Heapifying a CompactTupleSketch is not deprecated.
    */
   @Deprecated
-  public ArrayOfStringsSketch(final MemorySegment seg) {
+  public ArrayOfStringsTupleSketch(final MemorySegment seg) {
     super(seg, new ArrayOfStringsSummaryDeserializer(), new ArrayOfStringsSummaryFactory());
   }
 
@@ -79,7 +79,7 @@ public ArrayOfStringsSketch(final MemorySegment seg) {
    * Copy Constructor
    * @param sketch the sketch to copy
    */
-  public ArrayOfStringsSketch(final ArrayOfStringsSketch sketch) {
+  public ArrayOfStringsTupleSketch(final ArrayOfStringsTupleSketch sketch) {
     super(sketch);
   }
 
@@ -87,8 +87,8 @@ public ArrayOfStringsSketch(final ArrayOfStringsSketch sketch) {
    * @return a deep copy of this sketch
    */
   @Override
-  public ArrayOfStringsSketch copy() {
-    return new ArrayOfStringsSketch(this);
+  public ArrayOfStringsTupleSketch copy() {
+    return new ArrayOfStringsTupleSketch(this);
   }
 
   /**
diff --git a/src/test/java/org/apache/datasketches/theta/ConcurrentDirectQuickSelectSketchTest.java b/src/test/java/org/apache/datasketches/theta/ConcurrentDirectQuickSelectSketchTest.java
index 5163aaa97..2cd474d81 100644
--- a/src/test/java/org/apache/datasketches/theta/ConcurrentDirectQuickSelectSketchTest.java
+++ b/src/test/java/org/apache/datasketches/theta/ConcurrentDirectQuickSelectSketchTest.java
@@ -514,7 +514,7 @@ public void checkConstructReconstructFromMemorySegment() {
 
   @Test
   public void checkNullMemorySegment() {
-    final UpdateSketchBuilder bldr = new UpdateSketchBuilder();
+    final UpdatableThetaSketchBuilder bldr = new UpdatableThetaSketchBuilder();
     final UpdatableThetaSketch sk = bldr.build();
     for (int i = 0; i < 1000; i++) { sk.update(i); }
     final UpdatableThetaSketch shared = bldr.buildSharedFromSketch(sk, null);
@@ -546,7 +546,7 @@ public void checkConstructorSegTooSmall() {
     final int lgK = 4;
     final int k = 1 << lgK;
     final MemorySegment wseg = MemorySegment.ofArray(new byte[k/2]);
-    final UpdateSketchBuilder bldr = new UpdateSketchBuilder();
+    final UpdatableThetaSketchBuilder bldr = new UpdatableThetaSketchBuilder();
     bldr.setLogNominalEntries(lgK);
     bldr.buildShared(wseg);
   }
diff --git a/src/test/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketchTest.java b/src/test/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketchTest.java
index 393f79adb..0e3f4241a 100644
--- a/src/test/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketchTest.java
+++ b/src/test/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketchTest.java
@@ -635,7 +635,7 @@ public void checkBackgroundPropagation() {
 
   @Test
   public void checkBuilderExceptions() {
-    final UpdateSketchBuilder bldr = new UpdateSketchBuilder();
+    final UpdatableThetaSketchBuilder bldr = new UpdatableThetaSketchBuilder();
     try {
       bldr.setNominalEntries(8);
       fail();
@@ -683,7 +683,7 @@ static class SharedLocal {
     final int localLgK;
     final long seed;
     final MemorySegment wseg;
-    final UpdateSketchBuilder bldr = new UpdateSketchBuilder();
+    final UpdatableThetaSketchBuilder bldr = new UpdatableThetaSketchBuilder();
 
     SharedLocal() {
       this(9, 9, DefaultSeed, false, true, 1);
diff --git a/src/test/java/org/apache/datasketches/theta/CornerCaseThetaSetOperationsTest.java b/src/test/java/org/apache/datasketches/theta/CornerCaseThetaSetOperationsTest.java
index dd26d8f98..29fba0ec9 100644
--- a/src/test/java/org/apache/datasketches/theta/CornerCaseThetaSetOperationsTest.java
+++ b/src/test/java/org/apache/datasketches/theta/CornerCaseThetaSetOperationsTest.java
@@ -466,7 +466,7 @@ private static void checkResult(
   }
 
   private static UpdatableThetaSketch getSketch(SkType skType, float p, long value) {
-    UpdateSketchBuilder bldr = UpdatableThetaSketch.builder();
+    UpdatableThetaSketchBuilder bldr = UpdatableThetaSketch.builder();
     bldr.setLogNominalEntries(4);
     UpdatableThetaSketch sk;
     switch(skType) {
diff --git a/src/test/java/org/apache/datasketches/theta/ExamplesTest.java b/src/test/java/org/apache/datasketches/theta/ExamplesTest.java
index 8143597a4..f621e8448 100644
--- a/src/test/java/org/apache/datasketches/theta/ExamplesTest.java
+++ b/src/test/java/org/apache/datasketches/theta/ExamplesTest.java
@@ -61,7 +61,7 @@ Nominal Entries (k)     : 4096
   @Test
   public void theta2dot0Examples() {
     //Load source sketches
-    final UpdateSketchBuilder bldr = UpdatableThetaSketch.builder();
+    final UpdatableThetaSketchBuilder bldr = UpdatableThetaSketch.builder();
     final UpdatableThetaSketch skA = bldr.build();
     final UpdatableThetaSketch skB = bldr.build();
     for (int i = 1; i <= 1000; i++) {
diff --git a/src/test/java/org/apache/datasketches/theta/SingleItemSketchTest.java b/src/test/java/org/apache/datasketches/theta/SingleItemSketchTest.java
index 081d24629..09a536274 100644
--- a/src/test/java/org/apache/datasketches/theta/SingleItemSketchTest.java
+++ b/src/test/java/org/apache/datasketches/theta/SingleItemSketchTest.java
@@ -289,9 +289,9 @@ public void aNotB() {
 
   @Test
   public void checkHeapifyInstance() {
-    final UpdatableThetaSketch sk1 = new UpdateSketchBuilder().build();
+    final UpdatableThetaSketch sk1 = new UpdatableThetaSketchBuilder().build();
     sk1.update(1);
-    final UpdatableThetaSketch sk2 = new UpdateSketchBuilder().build();
+    final UpdatableThetaSketch sk2 = new UpdatableThetaSketchBuilder().build();
     sk2.update(1);
     final ThetaIntersection inter = ThetaSetOperation.builder().buildIntersection();
     inter.intersect(sk1);
@@ -307,7 +307,7 @@ public void checkHeapifyInstance() {
   @Test
   public void checkSingleItemBadFlags() {
     final short defaultSeedHash = Util.computeSeedHash(Util.DEFAULT_UPDATE_SEED);
-    final UpdatableThetaSketch sk1 = new UpdateSketchBuilder().build();
+    final UpdatableThetaSketch sk1 = new UpdatableThetaSketchBuilder().build();
     sk1.update(1);
     final MemorySegment wseg  = MemorySegment.ofArray(new byte[16]);
     sk1.compact(true, wseg );
@@ -330,7 +330,7 @@ public void checkDirectUnionSingleItem2() {
 
   @Test
   public void checkSingleItemCompact() {
-    final UpdatableThetaSketch sk1 = new UpdateSketchBuilder().build();
+    final UpdatableThetaSketch sk1 = new UpdatableThetaSketchBuilder().build();
     sk1.update(1);
     final CompactThetaSketch csk = sk1.compact();
     assertTrue(csk instanceof SingleItemSketch);
diff --git a/src/test/java/org/apache/datasketches/theta/UnionImplTest.java b/src/test/java/org/apache/datasketches/theta/UnionImplTest.java
index 4962aa5f1..9187f6e4d 100644
--- a/src/test/java/org/apache/datasketches/theta/UnionImplTest.java
+++ b/src/test/java/org/apache/datasketches/theta/UnionImplTest.java
@@ -237,7 +237,7 @@ public void checkDirectUnionSingleItem() {
     final int num = 2;
     final UpdatableThetaSketch[] skArr = new UpdatableThetaSketch[num];
     for (int i = 0; i < num; i++) {
-      skArr[i] = new UpdateSketchBuilder().build();
+      skArr[i] = new UpdatableThetaSketchBuilder().build();
     }
     for (int i = 0; i < (num/2); i++) {
       skArr[i].update(i);
diff --git a/src/test/java/org/apache/datasketches/theta/UpdateSketchTest.java b/src/test/java/org/apache/datasketches/theta/UpdateSketchTest.java
index 0b581c178..05e660089 100644
--- a/src/test/java/org/apache/datasketches/theta/UpdateSketchTest.java
+++ b/src/test/java/org/apache/datasketches/theta/UpdateSketchTest.java
@@ -114,7 +114,7 @@ public void checkStartingSubMultiple() {
 
   @Test
   public void checkBuilder() {
-    final UpdateSketchBuilder bldr = UpdatableThetaSketch.builder();
+    final UpdatableThetaSketchBuilder bldr = UpdatableThetaSketch.builder();
 
     final long seed = 12345L;
     bldr.setSeed(seed);
@@ -142,7 +142,7 @@ public void checkBuilder() {
 
   @Test(expectedExceptions = SketchesArgumentException.class)
   public void checkBuilderNomEntries() {
-    final UpdateSketchBuilder bldr = UpdatableThetaSketch.builder();
+    final UpdatableThetaSketchBuilder bldr = UpdatableThetaSketch.builder();
     final int k = 1 << 27;
     bldr.setNominalEntries(k);
   }
diff --git a/src/test/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSetsTest.java b/src/test/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSetsTest.java
index 613d67ff0..96452c012 100644
--- a/src/test/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSetsTest.java
+++ b/src/test/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSetsTest.java
@@ -21,12 +21,12 @@
 
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.theta.UpdatableThetaSketch;
-import org.apache.datasketches.theta.UpdateSketchBuilder;
+import org.apache.datasketches.theta.UpdatableThetaSketchBuilder;
 import org.apache.datasketches.thetacommon.BoundsOnRatiosInTupleSketchedSets;
-import org.apache.datasketches.tuple.Intersection;
-import org.apache.datasketches.tuple.Sketch;
-import org.apache.datasketches.tuple.UpdatableSketch;
-import org.apache.datasketches.tuple.UpdatableSketchBuilder;
+import org.apache.datasketches.tuple.TupleIntersection;
+import org.apache.datasketches.tuple.TupleSketch;
+import org.apache.datasketches.tuple.UpdatableTupleSketch;
+import org.apache.datasketches.tuple.UpdatableTupleSketchBuilder;
 import org.apache.datasketches.tuple.adouble.DoubleSummary;
 import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
 import org.apache.datasketches.tuple.adouble.DoubleSummarySetOperations;
@@ -44,22 +44,22 @@ public class BoundsOnRatiosInTupleSketchedSetsTest {
   private final DoubleSummary.Mode umode = DoubleSummary.Mode.Sum;
   private final DoubleSummarySetOperations dsso = new DoubleSummarySetOperations();
   private final DoubleSummaryFactory factory = new DoubleSummaryFactory(umode);
-  private final UpdateSketchBuilder thetaBldr = UpdatableThetaSketch.builder();
-  private final UpdatableSketchBuilder tupleBldr = new UpdatableSketchBuilder<>(factory);
+  private final UpdatableThetaSketchBuilder thetaBldr = UpdatableThetaSketch.builder();
+  private final UpdatableTupleSketchBuilder tupleBldr = new UpdatableTupleSketchBuilder<>(factory);
   private final Double constSummary = 1.0;
 
   @Test
   public void checkNormalReturns1() { // tuple, tuple
-    final UpdatableSketch skA = tupleBldr.build(); //4K
-    final UpdatableSketch skC = tupleBldr.build();
+    final UpdatableTupleSketch skA = tupleBldr.build(); //4K
+    final UpdatableTupleSketch skC = tupleBldr.build();
     final int uA = 10000;
     final int uC = 100000;
     for (int i = 0; i < uA; i++) { skA.update(i, constSummary); }
     for (int i = 0; i < uC; i++) { skC.update(i + (uA / 2), constSummary); }
-    final Intersection inter = new Intersection<>(dsso);
+    final TupleIntersection inter = new TupleIntersection<>(dsso);
     inter.intersect(skA);
     inter.intersect(skC);
-    final Sketch skB = inter.getResult();
+    final TupleSketch skB = inter.getResult();
 
     double est = BoundsOnRatiosInTupleSketchedSets.getEstimateOfBoverA(skA, skB);
     double lb = BoundsOnRatiosInTupleSketchedSets.getLowerBoundForBoverA(skA, skB);
@@ -88,16 +88,16 @@ public void checkNormalReturns1() { // tuple, tuple
 
   @Test
   public void checkNormalReturns2() { // tuple, theta
-    final UpdatableSketch skA = tupleBldr.build(); //4K
+    final UpdatableTupleSketch skA = tupleBldr.build(); //4K
     final UpdatableThetaSketch skC = thetaBldr.build();
     final int uA = 10000;
     final int uC = 100000;
     for (int i = 0; i < uA; i++) { skA.update(i, constSummary); }
     for (int i = 0; i < uC; i++) { skC.update(i + (uA / 2)); }
-    final Intersection inter = new Intersection<>(dsso);
+    final TupleIntersection inter = new TupleIntersection<>(dsso);
     inter.intersect(skA);
     inter.intersect(skC, factory.newSummary());
-    final Sketch skB = inter.getResult();
+    final TupleSketch skB = inter.getResult();
 
     double est = BoundsOnRatiosInTupleSketchedSets.getEstimateOfBoverA(skA, skB);
     double lb = BoundsOnRatiosInTupleSketchedSets.getLowerBoundForBoverA(skA, skB);
@@ -126,8 +126,8 @@ public void checkNormalReturns2() { // tuple, theta
 
   @Test(expectedExceptions = SketchesArgumentException.class)
   public void checkAbnormalReturns1() { // tuple, tuple
-    final UpdatableSketch skA = tupleBldr.build(); //4K
-    final UpdatableSketch skC = tupleBldr.build();
+    final UpdatableTupleSketch skA = tupleBldr.build(); //4K
+    final UpdatableTupleSketch skC = tupleBldr.build();
     final int uA = 100000;
     final int uC = 10000;
     for (int i = 0; i < uA; i++) { skA.update(i, constSummary); }
@@ -137,7 +137,7 @@ public void checkAbnormalReturns1() { // tuple, tuple
 
   @Test(expectedExceptions = SketchesArgumentException.class)
   public void checkAbnormalReturns2() { // tuple, theta
-    final UpdatableSketch skA = tupleBldr.build(); //4K
+    final UpdatableTupleSketch skA = tupleBldr.build(); //4K
     final UpdatableThetaSketch skC = thetaBldr.build();
     final int uA = 100000;
     final int uC = 10000;
diff --git a/src/test/java/org/apache/datasketches/tuple/CompactSketchWithDoubleSummaryTest.java b/src/test/java/org/apache/datasketches/tuple/CompactSketchWithDoubleSummaryTest.java
index a093d4feb..ab855b583 100644
--- a/src/test/java/org/apache/datasketches/tuple/CompactSketchWithDoubleSummaryTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/CompactSketchWithDoubleSummaryTest.java
@@ -22,12 +22,11 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.tuple.CompactSketch;
-import org.apache.datasketches.tuple.Sketch;
-import org.apache.datasketches.tuple.Sketches;
+import org.apache.datasketches.tuple.CompactTupleSketch;
+import org.apache.datasketches.tuple.TupleSketch;
 import org.apache.datasketches.tuple.TupleSketchIterator;
-import org.apache.datasketches.tuple.UpdatableSketch;
-import org.apache.datasketches.tuple.UpdatableSketchBuilder;
+import org.apache.datasketches.tuple.UpdatableTupleSketch;
+import org.apache.datasketches.tuple.UpdatableTupleSketchBuilder;
 import org.apache.datasketches.tuple.adouble.DoubleSummary;
 import org.apache.datasketches.tuple.adouble.DoubleSummaryDeserializer;
 import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
@@ -40,8 +39,8 @@ public class CompactSketchWithDoubleSummaryTest {
 
   @Test
   public void emptyFromNonPublicConstructorNullArray() {
-    CompactSketch sketch =
-        new CompactSketch<>(null, null, Long.MAX_VALUE, true);
+    CompactTupleSketch sketch =
+        new CompactTupleSketch<>(null, null, Long.MAX_VALUE, true);
     Assert.assertTrue(sketch.isEmpty());
     Assert.assertFalse(sketch.isEstimationMode());
     Assert.assertEquals(sketch.getEstimate(), 0.0);
@@ -61,8 +60,8 @@ public void emptyFromNonPublicConstructor() {
     long[] keys = new long[0];
     DoubleSummary[] summaries =
         (DoubleSummary[]) java.lang.reflect.Array.newInstance(DoubleSummary.class, 0);
-    CompactSketch sketch =
-        new CompactSketch<>(keys, summaries, Long.MAX_VALUE, true);
+    CompactTupleSketch sketch =
+        new CompactTupleSketch<>(keys, summaries, Long.MAX_VALUE, true);
     Assert.assertTrue(sketch.isEmpty());
     Assert.assertFalse(sketch.isEstimationMode());
     Assert.assertEquals(sketch.getEstimate(), 0.0);
@@ -78,9 +77,9 @@ public void emptyFromNonPublicConstructor() {
 
   @Test
   public void emptyFromQuickSelectSketch() {
-    UpdatableSketch us =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
-    CompactSketch sketch = us.compact();
+    UpdatableTupleSketch us =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    CompactTupleSketch sketch = us.compact();
     Assert.assertTrue(sketch.isEmpty());
     Assert.assertFalse(sketch.isEstimationMode());
     Assert.assertEquals(sketch.getEstimate(), 0.0);
@@ -96,15 +95,15 @@ public void emptyFromQuickSelectSketch() {
 
   @Test
   public void exactModeFromQuickSelectSketch() {
-    UpdatableSketch us =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    UpdatableTupleSketch us =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
     us.update(1, 1.0);
     us.update(2, 1.0);
     us.update(3, 1.0);
     us.update(1, 1.0);
     us.update(2, 1.0);
     us.update(3, 1.0);
-    CompactSketch sketch = us.compact();
+    CompactTupleSketch sketch = us.compact();
     Assert.assertFalse(sketch.isEmpty());
     Assert.assertFalse(sketch.isEstimationMode());
     Assert.assertEquals(sketch.getEstimate(), 3.0);
@@ -124,14 +123,14 @@ public void exactModeFromQuickSelectSketch() {
 
   @Test
   public void serializeDeserializeSmallExact() {
-    UpdatableSketch us =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    UpdatableTupleSketch us =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
     us.update("a", 1.0);
     us.update("b", 1.0);
     us.update("c", 1.0);
-    CompactSketch sketch1 = us.compact();
-    Sketch sketch2 =
-        Sketches.heapifySketch(MemorySegment.ofArray(sketch1.toByteArray()),
+    CompactTupleSketch sketch1 = us.compact();
+    TupleSketch sketch2 =
+        TupleSketch.heapifySketch(MemorySegment.ofArray(sketch1.toByteArray()),
             new DoubleSummaryDeserializer());
     Assert.assertFalse(sketch2.isEmpty());
     Assert.assertFalse(sketch2.isEstimationMode());
@@ -152,20 +151,20 @@ public void serializeDeserializeSmallExact() {
 
   @Test
   public void serializeDeserializeEstimation() throws Exception {
-    UpdatableSketch us =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    UpdatableTupleSketch us =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
     for (int i = 0; i < 8192; i++) {
       us.update(i, 1.0);
     }
     us.trim();
-    CompactSketch sketch1 = us.compact();
+    CompactTupleSketch sketch1 = us.compact();
     byte[] bytes = sketch1.toByteArray();
 
     // for binary testing
     //TestUtil.writeBytesToFile(bytes, "CompactSketchWithDoubleSummary4K.sk");
 
-    Sketch sketch2 =
-        Sketches.heapifySketch(MemorySegment.ofArray(bytes), new DoubleSummaryDeserializer());
+    TupleSketch sketch2 =
+        TupleSketch.heapifySketch(MemorySegment.ofArray(bytes), new DoubleSummaryDeserializer());
     Assert.assertFalse(sketch2.isEmpty());
     Assert.assertTrue(sketch2.isEstimationMode());
     Assert.assertEquals(sketch2.getEstimate(), sketch1.getEstimate());
@@ -181,13 +180,13 @@ public void serializeDeserializeEstimation() throws Exception {
 
   @Test(expectedExceptions = SketchesArgumentException.class)
   public void deserializeWrongType() {
-    UpdatableSketch us =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    UpdatableTupleSketch us =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
     for (int i = 0; i < 8192; i++) {
       us.update(i, 1.0);
     }
-    CompactSketch sketch1 = us.compact();
-    Sketches.heapifyUpdatableSketch(MemorySegment.ofArray(sketch1.toByteArray()),
+    CompactTupleSketch sketch1 = us.compact();
+    TupleSketch.heapifyUpdatableSketch(MemorySegment.ofArray(sketch1.toByteArray()),
         new DoubleSummaryDeserializer(),
         new DoubleSummaryFactory(mode));
   }
diff --git a/src/test/java/org/apache/datasketches/tuple/JaccardSimilarityTest.java b/src/test/java/org/apache/datasketches/tuple/JaccardSimilarityTest.java
index 2bb2ecd3d..4b789a5ce 100644
--- a/src/test/java/org/apache/datasketches/tuple/JaccardSimilarityTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/JaccardSimilarityTest.java
@@ -20,9 +20,9 @@
 package org.apache.datasketches.tuple;
 
 import org.apache.datasketches.theta.UpdatableThetaSketch;
-import org.apache.datasketches.theta.UpdateSketchBuilder;
-import org.apache.datasketches.tuple.UpdatableSketch;
-import org.apache.datasketches.tuple.UpdatableSketchBuilder;
+import org.apache.datasketches.theta.UpdatableThetaSketchBuilder;
+import org.apache.datasketches.tuple.UpdatableTupleSketch;
+import org.apache.datasketches.tuple.UpdatableTupleSketchBuilder;
 import org.apache.datasketches.tuple.adouble.DoubleSummary;
 import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
 import org.apache.datasketches.tuple.adouble.DoubleSummarySetOperations;
@@ -43,8 +43,8 @@ public class JaccardSimilarityTest {
   private final DoubleSummary.Mode umode = DoubleSummary.Mode.Sum;
   private final DoubleSummarySetOperations dsso = new DoubleSummarySetOperations();
   private final DoubleSummaryFactory factory = new DoubleSummaryFactory(umode);
-  private final UpdateSketchBuilder thetaBldr = UpdatableThetaSketch.builder();
-  private final UpdatableSketchBuilder tupleBldr = new UpdatableSketchBuilder<>(factory);
+  private final UpdatableThetaSketchBuilder thetaBldr = UpdatableThetaSketch.builder();
+  private final UpdatableTupleSketchBuilder tupleBldr = new UpdatableTupleSketchBuilder<>(factory);
   private final Double constSummary = 1.0;
 
   @Test
@@ -61,8 +61,8 @@ public void checkNullsEmpties1() { // tuple, tuple
     state = exactlyEqual(null, null, dsso);
     assertFalse(state);
 
-    final UpdatableSketch measured = tupleBldr.setNominalEntries(minK).build();
-    final UpdatableSketch expected = tupleBldr.setNominalEntries(minK).build();
+    final UpdatableTupleSketch measured = tupleBldr.setNominalEntries(minK).build();
+    final UpdatableTupleSketch expected = tupleBldr.setNominalEntries(minK).build();
 
     //check both empty
     jResults = jaccard(measured, expected, dsso);
@@ -103,7 +103,7 @@ public void checkNullsEmpties2() { // tuple, theta
     state = exactlyEqual(null, null, factory.newSummary(), dsso);
     assertFalse(state);
 
-    final UpdatableSketch measured = tupleBldr.setNominalEntries(minK).build();
+    final UpdatableTupleSketch measured = tupleBldr.setNominalEntries(minK).build();
     final UpdatableThetaSketch expected = thetaBldr.setNominalEntries(minK).build();
 
     //check both empty
@@ -138,8 +138,8 @@ public void checkExactMode1() { // tuple, tuple
     double threshold = 0.9999;
     println("Exact Mode, minK: " + k + "\t Th: " + threshold);
 
-    final UpdatableSketch measured = tupleBldr.setNominalEntries(k).build();
-    final UpdatableSketch expected = tupleBldr.setNominalEntries(k).build();
+    final UpdatableTupleSketch measured = tupleBldr.setNominalEntries(k).build();
+    final UpdatableTupleSketch expected = tupleBldr.setNominalEntries(k).build();
 
     for (int i = 0; i < (u-1); i++) { //one short
       measured.update(i, constSummary);
@@ -174,7 +174,7 @@ public void checkExactMode2() { // tuple, theta
     double threshold = 0.9999;
     println("Exact Mode, minK: " + k + "\t Th: " + threshold);
 
-    final UpdatableSketch measured = tupleBldr.setNominalEntries(k).build();
+    final UpdatableTupleSketch measured = tupleBldr.setNominalEntries(k).build();
     final UpdatableThetaSketch expected = thetaBldr.setNominalEntries(k).build();
 
     for (int i = 0; i < (u-1); i++) { //one short
@@ -210,8 +210,8 @@ public void checkEstMode1() { // tuple, tuple
     double threshold = 0.9999;
     println("Estimation Mode, minK: " + k + "\t Th: " + threshold);
 
-    final UpdatableSketch measured = tupleBldr.setNominalEntries(k).build();
-    final UpdatableSketch expected = tupleBldr.setNominalEntries(k).build();
+    final UpdatableTupleSketch measured = tupleBldr.setNominalEntries(k).build();
+    final UpdatableTupleSketch expected = tupleBldr.setNominalEntries(k).build();
 
     for (int i = 0; i < u; i++) {
       measured.update(i, constSummary);
@@ -248,7 +248,7 @@ public void checkEstMode2() { // tuple, theta
     double threshold = 0.9999;
     println("Estimation Mode, minK: " + k + "\t Th: " + threshold);
 
-    final UpdatableSketch measured = tupleBldr.setNominalEntries(k).build();
+    final UpdatableTupleSketch measured = tupleBldr.setNominalEntries(k).build();
     final UpdatableThetaSketch expected = thetaBldr.setNominalEntries(k).build();
 
     for (int i = 0; i < u; i++) {
@@ -292,8 +292,8 @@ public void checkSimilarity1() { // tuple, tuple
     double threshold = 0.943;
     println("Estimation Mode, minK: " + minK + "\t Th: " + threshold);
 
-    final UpdatableSketch measured = tupleBldr.setNominalEntries(minK).build();
-    final UpdatableSketch expected = tupleBldr.setNominalEntries(minK).build();
+    final UpdatableTupleSketch measured = tupleBldr.setNominalEntries(minK).build();
+    final UpdatableTupleSketch expected = tupleBldr.setNominalEntries(minK).build();
 
     for (int i = 0; i < u1; i++) {
       expected.update(i, constSummary);
@@ -325,7 +325,7 @@ public void checkSimilarity2() { // tuple, theta
     double threshold = 0.943;
     println("Estimation Mode, minK: " + minK + "\t Th: " + threshold);
 
-    final UpdatableSketch measured = tupleBldr.setNominalEntries(minK).build();
+    final UpdatableTupleSketch measured = tupleBldr.setNominalEntries(minK).build();
     final UpdatableThetaSketch expected = thetaBldr.setNominalEntries(minK).build();
 
     for (int i = 0; i < u1; i++) {
@@ -358,8 +358,8 @@ public void checkDissimilarity1() { // tuple, tuple
     double threshold = 0.061;
     println("Estimation Mode, minK: " + minK + "\t Th: " + threshold);
 
-    final UpdatableSketch measured = tupleBldr.setNominalEntries(minK).setNominalEntries(minK).build();
-    final UpdatableSketch expected = tupleBldr.setNominalEntries(minK).setNominalEntries(minK).build();
+    final UpdatableTupleSketch measured = tupleBldr.setNominalEntries(minK).setNominalEntries(minK).build();
+    final UpdatableTupleSketch expected = tupleBldr.setNominalEntries(minK).setNominalEntries(minK).build();
 
     for (int i = 0; i < u1; i++) {
       expected.update(i, constSummary);
@@ -388,7 +388,7 @@ public void checkDissimilarity2() { // tuple, theta
     double threshold = 0.061;
     println("Estimation Mode, minK: " + minK + "\t Th: " + threshold);
 
-    final UpdatableSketch measured = tupleBldr.setNominalEntries(minK).setNominalEntries(minK).build();
+    final UpdatableTupleSketch measured = tupleBldr.setNominalEntries(minK).setNominalEntries(minK).build();
     final UpdatableThetaSketch expected = thetaBldr.setNominalEntries(minK).build();
 
     for (int i = 0; i < u1; i++) {
@@ -414,8 +414,8 @@ private static String jaccardString(double[] jResults) {
 
   @Test
   public void checkMinK1() { // tuple, tuple
-    final UpdatableSketch skA = tupleBldr.build(); //4096
-    final UpdatableSketch skB = tupleBldr.build(); //4096
+    final UpdatableTupleSketch skA = tupleBldr.build(); //4096
+    final UpdatableTupleSketch skB = tupleBldr.build(); //4096
     skA.update(1, constSummary);
     skB.update(1, constSummary);
     double[] result = jaccard(skA, skB, dsso);
@@ -430,7 +430,7 @@ public void checkMinK1() { // tuple, tuple
 
   @Test
   public void checkMinK2() { // tuple, theta
-    final UpdatableSketch skA = tupleBldr.build(); //4096
+    final UpdatableTupleSketch skA = tupleBldr.build(); //4096
     final UpdatableThetaSketch skB = UpdatableThetaSketch.builder().build(); //4096
     skA.update(1, constSummary);
     skB.update(1);
diff --git a/src/test/java/org/apache/datasketches/tuple/MiscTest.java b/src/test/java/org/apache/datasketches/tuple/MiscTest.java
index e4eb97064..431dccd94 100644
--- a/src/test/java/org/apache/datasketches/tuple/MiscTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/MiscTest.java
@@ -23,8 +23,8 @@
 import static org.testng.Assert.assertTrue;
 
 import org.apache.datasketches.thetacommon.SetOperationCornerCases.CornerCase;
-import org.apache.datasketches.tuple.UpdatableSketch;
-import org.apache.datasketches.tuple.UpdatableSketchBuilder;
+import org.apache.datasketches.tuple.UpdatableTupleSketch;
+import org.apache.datasketches.tuple.UpdatableTupleSketchBuilder;
 import org.apache.datasketches.tuple.Util;
 import org.apache.datasketches.tuple.adouble.DoubleSummary;
 import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
@@ -39,10 +39,10 @@ public class MiscTest {
   @Test
   public void checkUpdatableSketchBuilderReset() {
     final DoubleSummary.Mode mode = Mode.Sum;
-    final UpdatableSketchBuilder bldr =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode));
+    final UpdatableTupleSketchBuilder bldr =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode));
     bldr.reset();
-    final UpdatableSketch sk = bldr.build();
+    final UpdatableTupleSketch sk = bldr.build();
     assertTrue(sk.isEmpty());
   }
 
@@ -76,13 +76,13 @@ public void checkById() {
   @Test
   public void checkCopyCtor() {
     final DoubleSummary.Mode mode = Mode.Sum;
-    final UpdatableSketchBuilder bldr =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode));
+    final UpdatableTupleSketchBuilder bldr =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode));
     bldr.reset();
-    final UpdatableSketch sk = bldr.build();
+    final UpdatableTupleSketch sk = bldr.build();
     sk.update(1.0, 1.0);
     assertEquals(sk.getRetainedEntries(), 1);
-    final  UpdatableSketch sk2 = sk.copy();
+    final  UpdatableTupleSketch sk2 = sk.copy();
     assertEquals(sk2.getRetainedEntries(), 1);
   }
 
diff --git a/src/test/java/org/apache/datasketches/tuple/ReadOnlyMemorySegmentTest.java b/src/test/java/org/apache/datasketches/tuple/ReadOnlyMemorySegmentTest.java
index 9e6d4b231..557133b23 100644
--- a/src/test/java/org/apache/datasketches/tuple/ReadOnlyMemorySegmentTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/ReadOnlyMemorySegmentTest.java
@@ -24,7 +24,6 @@
 import org.apache.datasketches.common.SketchesReadOnlyException;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSetOperationBuilder;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketches;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUnion;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketch;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketchBuilder;
@@ -38,7 +37,7 @@ public void wrapAndTryUpdatingSketch() {
     final ArrayOfDoublesUpdatableSketch sketch1 = new ArrayOfDoublesUpdatableSketchBuilder().build();
     sketch1.update(1, new double[] {1});
     final ArrayOfDoublesUpdatableSketch sketch2 = (ArrayOfDoublesUpdatableSketch)
-        ArrayOfDoublesSketches.wrapSketch(MemorySegment.ofArray(sketch1.toByteArray()));
+        ArrayOfDoublesSketch.wrapSketch(MemorySegment.ofArray(sketch1.toByteArray()));
     Assert.assertEquals(sketch2.getEstimate(), 1.0);
     sketch2.toByteArray();
     boolean thrown = false;
@@ -61,7 +60,7 @@ public void heapifyAndUpdateSketch() {
     sketch1.update(1, new double[] {1});
     // downcasting is not recommended, for testing only
     final ArrayOfDoublesUpdatableSketch sketch2 = (ArrayOfDoublesUpdatableSketch)
-        ArrayOfDoublesSketches.heapifySketch(MemorySegment.ofArray(sketch1.toByteArray()));
+        ArrayOfDoublesSketch.heapifySketch(MemorySegment.ofArray(sketch1.toByteArray()));
     sketch2.update(2, new double[] {1});
     Assert.assertEquals(sketch2.getEstimate(), 2.0);
   }
@@ -76,7 +75,7 @@ public void wrapAndTryUpdatingUnionEstimationMode() {
     }
     final ArrayOfDoublesUnion union1 = new ArrayOfDoublesSetOperationBuilder().buildUnion();
     union1.union(sketch1);
-    final ArrayOfDoublesUnion union2 = ArrayOfDoublesSketches.wrapUnion(MemorySegment.ofArray(union1.toByteArray()).asReadOnly());
+    final ArrayOfDoublesUnion union2 = ArrayOfDoublesSketch.wrapUnion(MemorySegment.ofArray(union1.toByteArray()).asReadOnly());
     final ArrayOfDoublesSketch resultSketch = union2.getResult();
     Assert.assertTrue(resultSketch.isEstimationMode());
     Assert.assertEquals(resultSketch.getEstimate(), numUniques, numUniques * 0.04);
@@ -106,7 +105,7 @@ public void heapifyAndUpdateUnion() {
     }
     final ArrayOfDoublesUnion union1 = new ArrayOfDoublesSetOperationBuilder().buildUnion();
     union1.union(sketch1);
-    final ArrayOfDoublesUnion union2 = ArrayOfDoublesSketches.heapifyUnion(MemorySegment.ofArray(union1.toByteArray()));
+    final ArrayOfDoublesUnion union2 = ArrayOfDoublesSketch.heapifyUnion(MemorySegment.ofArray(union1.toByteArray()));
     final ArrayOfDoublesSketch resultSketch = union2.getResult();
     Assert.assertTrue(resultSketch.isEstimationMode());
     Assert.assertEquals(resultSketch.getEstimate(), numUniques, numUniques * 0.04);
diff --git a/src/test/java/org/apache/datasketches/tuple/SerializerDeserializerTest.java b/src/test/java/org/apache/datasketches/tuple/SerializerDeserializerTest.java
index 92a8599b7..92d18639f 100644
--- a/src/test/java/org/apache/datasketches/tuple/SerializerDeserializerTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/SerializerDeserializerTest.java
@@ -34,8 +34,8 @@ public class SerializerDeserializerTest {
   @Test
   public void validSketchType() {
     byte[] bytes = new byte[4];
-    bytes[SerializerDeserializer.TYPE_BYTE_OFFSET] = (byte) SerializerDeserializer.SketchType.CompactSketch.ordinal();
-    Assert.assertEquals(SerializerDeserializer.getSketchType(MemorySegment.ofArray(bytes)), SerializerDeserializer.SketchType.CompactSketch);
+    bytes[SerializerDeserializer.TYPE_BYTE_OFFSET] = (byte) SerializerDeserializer.SketchType.CompactTupleSketch.ordinal();
+    Assert.assertEquals(SerializerDeserializer.getSketchType(MemorySegment.ofArray(bytes)), SerializerDeserializer.SketchType.CompactTupleSketch);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
diff --git a/src/test/java/org/apache/datasketches/tuple/TupleCrossLanguageTest.java b/src/test/java/org/apache/datasketches/tuple/TupleCrossLanguageTest.java
index f20cb99dc..b2f70b7bb 100644
--- a/src/test/java/org/apache/datasketches/tuple/TupleCrossLanguageTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/TupleCrossLanguageTest.java
@@ -33,11 +33,10 @@
 
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.TestUtil;
-import org.apache.datasketches.tuple.Sketch;
-import org.apache.datasketches.tuple.Sketches;
+import org.apache.datasketches.tuple.TupleSketch;
 import org.apache.datasketches.tuple.TupleSketchIterator;
-import org.apache.datasketches.tuple.UpdatableSketch;
-import org.apache.datasketches.tuple.UpdatableSketchBuilder;
+import org.apache.datasketches.tuple.UpdatableTupleSketch;
+import org.apache.datasketches.tuple.UpdatableTupleSketchBuilder;
 import org.apache.datasketches.tuple.adouble.DoubleSummary;
 import org.apache.datasketches.tuple.adouble.DoubleSummaryDeserializer;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUnion;
@@ -49,7 +48,7 @@ public class TupleCrossLanguageTest {
   @Test(groups = {CHECK_CPP_HISTORICAL_FILES})
   public void serialVersion1Compatibility() {
     final byte[] byteArr = TestUtil.getResourceBytes("CompactSketchWithDoubleSummary4K_serialVersion1.sk");
-    Sketch sketch = Sketches.heapifySketch(MemorySegment.ofArray(byteArr), new DoubleSummaryDeserializer());
+    TupleSketch sketch = TupleSketch.heapifySketch(MemorySegment.ofArray(byteArr), new DoubleSummaryDeserializer());
     Assert.assertTrue(sketch.isEstimationMode());
     Assert.assertEquals(sketch.getEstimate(), 8192, 8192 * 0.99);
     Assert.assertEquals(sketch.getRetainedEntries(), 4096);
@@ -65,19 +64,19 @@ public void serialVersion1Compatibility() {
   @Test(groups = {CHECK_CPP_HISTORICAL_FILES})
   public void version2Compatibility() {
     final byte[] byteArr = TestUtil.getResourceBytes("TupleWithTestIntegerSummary4kTrimmedSerVer2.sk");
-    Sketch sketch1 = Sketches.heapifySketch(MemorySegment.ofArray(byteArr), new IntegerSummaryDeserializer());
+    TupleSketch sketch1 = TupleSketch.heapifySketch(MemorySegment.ofArray(byteArr), new IntegerSummaryDeserializer());
 
     // construct the same way
     final int lgK = 12;
     final int K = 1 << lgK;
-    final UpdatableSketchBuilder builder =
-            new UpdatableSketchBuilder<>(new IntegerSummaryFactory());
-    final UpdatableSketch updatableSketch = builder.build();
+    final UpdatableTupleSketchBuilder builder =
+            new UpdatableTupleSketchBuilder<>(new IntegerSummaryFactory());
+    final UpdatableTupleSketch updatableSketch = builder.build();
     for (int i = 0; i < 2 * K; i++) {
       updatableSketch.update(i, 1);
     }
     updatableSketch.trim();
-    Sketch sketch2 = updatableSketch.compact();
+    TupleSketch sketch2 = updatableSketch.compact();
 
     Assert.assertEquals(sketch1.getRetainedEntries(), sketch2.getRetainedEntries());
     Assert.assertEquals(sketch1.getThetaLong(), sketch2.getThetaLong());
@@ -90,8 +89,8 @@ public void deserializeFromCppIntegerSummary() throws IOException {
     final int[] nArr = {0, 1, 10, 100, 1000, 10_000, 100_000, 1_000_000};
     for (int n: nArr) {
       final byte[] bytes = Files.readAllBytes(cppPath.resolve("tuple_int_n" + n + "_cpp.sk"));
-      final Sketch sketch =
-          Sketches.heapifySketch(MemorySegment.ofArray(bytes), new IntegerSummaryDeserializer());
+      final TupleSketch sketch =
+          TupleSketch.heapifySketch(MemorySegment.ofArray(bytes), new IntegerSummaryDeserializer());
       assertTrue(n == 0 ? sketch.isEmpty() : !sketch.isEmpty());
       assertTrue(n > 1000 ? sketch.isEstimationMode() : !sketch.isEstimationMode());
       assertEquals(sketch.getEstimate(), n, n * 0.03);
@@ -107,8 +106,8 @@ public void deserializeFromCppIntegerSummary() throws IOException {
   public void generateForCppIntegerSummary() throws IOException {
     final int[] nArr = {0, 1, 10, 100, 1000, 10_000, 100_000, 1_000_000};
     for (int n: nArr) {
-      final UpdatableSketch sk =
-          new UpdatableSketchBuilder<>(new IntegerSummaryFactory()).build();
+      final UpdatableTupleSketch sk =
+          new UpdatableTupleSketchBuilder<>(new IntegerSummaryFactory()).build();
       for (int i = 0; i < n; i++) {
         sk.update(i, i);
       }
diff --git a/src/test/java/org/apache/datasketches/tuple/TupleExamples2Test.java b/src/test/java/org/apache/datasketches/tuple/TupleExamples2Test.java
index 092b1346d..8d8151187 100644
--- a/src/test/java/org/apache/datasketches/tuple/TupleExamples2Test.java
+++ b/src/test/java/org/apache/datasketches/tuple/TupleExamples2Test.java
@@ -22,17 +22,11 @@
   import static org.testng.Assert.assertEquals;
 
 import org.apache.datasketches.theta.UpdatableThetaSketch;
-import org.apache.datasketches.theta.UpdateSketchBuilder;
-import org.apache.datasketches.tuple.CompactSketch;
-import org.apache.datasketches.tuple.Intersection;
-import org.apache.datasketches.tuple.TupleSketchIterator;
-import org.apache.datasketches.tuple.Union;
-import org.apache.datasketches.tuple.UpdatableSketch;
-import org.apache.datasketches.tuple.UpdatableSketchBuilder;
+import org.apache.datasketches.theta.UpdatableThetaSketchBuilder;
 import org.apache.datasketches.tuple.adouble.DoubleSummary;
+import org.apache.datasketches.tuple.adouble.DoubleSummary.Mode;
 import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
 import org.apache.datasketches.tuple.adouble.DoubleSummarySetOperations;
-import org.apache.datasketches.tuple.adouble.DoubleSummary.Mode;
 import org.testng.annotations.Test;
 
   /**
@@ -47,28 +41,28 @@ public class TupleExamples2Test {
     private final DoubleSummarySetOperations dsso2 = new DoubleSummarySetOperations(umode, imode);
     private final DoubleSummaryFactory ufactory = new DoubleSummaryFactory(umode);
     private final DoubleSummaryFactory ifactory = new DoubleSummaryFactory(imode);
-    private final UpdateSketchBuilder thetaBldr = UpdatableThetaSketch.builder();
-    private final UpdatableSketchBuilder tupleBldr =
-        new UpdatableSketchBuilder<>(ufactory);
+    private final UpdatableThetaSketchBuilder thetaBldr = UpdatableThetaSketch.builder();
+    private final UpdatableTupleSketchBuilder tupleBldr =
+        new UpdatableTupleSketchBuilder<>(ufactory);
 
 
     @Test
     public void example1() { // stateful: tuple, theta, use dsso2
       //Load source sketches
-      final UpdatableSketch tupleSk = tupleBldr.build();
+      final UpdatableTupleSketch tupleSk = tupleBldr.build();
       final UpdatableThetaSketch thetaSk = thetaBldr.build();
       for (int i = 1; i <= 12; i++) {
         tupleSk.update(i, 1.0);
         thetaSk.update(i + 3);
       }
 
-      //Union
-      final Union union = new Union<>(dsso2);
+      //TupleUnion
+      final TupleUnion union = new TupleUnion<>(dsso2);
       union.union(tupleSk);
       union.union(thetaSk, ufactory.newSummary().update(1.0));
-      final CompactSketch ucsk = union.getResult();
+      final CompactTupleSketch ucsk = union.getResult();
       int entries = ucsk.getRetainedEntries();
-      println("Union Stateful: tuple, theta: " + entries);
+      println("TupleUnion Stateful: tuple, theta: " + entries);
       final TupleSketchIterator uiter = ucsk.iterator();
       int counter = 1;
       int twos = 0;
@@ -82,13 +76,13 @@ public void example1() { // stateful: tuple, theta, use dsso2
       assertEquals(ones, 6);
       assertEquals(twos, 9);
 
-      //Intersection
-      final Intersection inter = new Intersection<>(dsso2);
+      //TupleIntersection
+      final TupleIntersection inter = new TupleIntersection<>(dsso2);
       inter.intersect(tupleSk);
       inter.intersect(thetaSk, ifactory.newSummary().update(1.0));
-      final CompactSketch icsk = inter.getResult();
+      final CompactTupleSketch icsk = inter.getResult();
       entries = icsk.getRetainedEntries();
-      println("Intersection Stateful: tuple, theta: " + entries);
+      println("TupleIntersection Stateful: tuple, theta: " + entries);
       final TupleSketchIterator iiter = icsk.iterator();
       counter = 1;
       while (iiter.next()) {
@@ -101,19 +95,19 @@ public void example1() { // stateful: tuple, theta, use dsso2
     @Test
     public void example2() { //stateless: tuple1, tuple2, use dsso2
       //Load source sketches
-      final UpdatableSketch tupleSk1 = tupleBldr.build();
-      final UpdatableSketch tupleSk2 = tupleBldr.build();
+      final UpdatableTupleSketch tupleSk1 = tupleBldr.build();
+      final UpdatableTupleSketch tupleSk2 = tupleBldr.build();
 
       for (int i = 1; i <= 12; i++) {
         tupleSk1.update(i, 1.0);
         tupleSk2.update(i + 3, 1.0);
       }
 
-      //Union
-      final Union union = new Union<>(dsso2);
-      final CompactSketch ucsk = union.union(tupleSk1, tupleSk2);
+      //TupleUnion
+      final TupleUnion union = new TupleUnion<>(dsso2);
+      final CompactTupleSketch ucsk = union.union(tupleSk1, tupleSk2);
       int entries = ucsk.getRetainedEntries();
-      println("Union: " + entries);
+      println("TupleUnion: " + entries);
       final TupleSketchIterator uiter = ucsk.iterator();
       int counter = 1;
       int twos = 0;
@@ -127,11 +121,11 @@ public void example2() { //stateless: tuple1, tuple2, use dsso2
       assertEquals(ones, 6);
       assertEquals(twos, 9);
 
-      //Intersection
-      final Intersection inter = new Intersection<>(dsso2);
-      final CompactSketch icsk = inter.intersect(tupleSk1, tupleSk2);
+      //TupleIntersection
+      final TupleIntersection inter = new TupleIntersection<>(dsso2);
+      final CompactTupleSketch icsk = inter.intersect(tupleSk1, tupleSk2);
       entries = icsk.getRetainedEntries();
-      println("Intersection: " + entries);
+      println("TupleIntersection: " + entries);
       final TupleSketchIterator iiter = icsk.iterator();
       counter = 1;
       while (iiter.next()) {
@@ -144,19 +138,19 @@ public void example2() { //stateless: tuple1, tuple2, use dsso2
     @Test
     public void example3() { //stateless: tuple1, tuple2, use dsso2
       //Load source sketches
-      final UpdatableSketch tupleSk = tupleBldr.build();
+      final UpdatableTupleSketch tupleSk = tupleBldr.build();
       final UpdatableThetaSketch thetaSk = thetaBldr.build();
       for (int i = 1; i <= 12; i++) {
         tupleSk.update(i, 1.0);
         thetaSk.update(i + 3);
       }
 
-      //Union
-      final Union union = new Union<>(dsso2);
-      final CompactSketch ucsk =
+      //TupleUnion
+      final TupleUnion union = new TupleUnion<>(dsso2);
+      final CompactTupleSketch ucsk =
           union.union(tupleSk, thetaSk, ufactory.newSummary().update(1.0));
       int entries = ucsk.getRetainedEntries();
-      println("Union: " + entries);
+      println("TupleUnion: " + entries);
       final TupleSketchIterator uiter = ucsk.iterator();
       int counter = 1;
       int twos = 0;
@@ -170,12 +164,12 @@ public void example3() { //stateless: tuple1, tuple2, use dsso2
       assertEquals(ones, 6);
       assertEquals(twos, 9);
 
-      //Intersection
-      final Intersection inter = new Intersection<>(dsso2);
-      final CompactSketch icsk =
+      //TupleIntersection
+      final TupleIntersection inter = new TupleIntersection<>(dsso2);
+      final CompactTupleSketch icsk =
           inter.intersect(tupleSk, thetaSk, ufactory.newSummary().update(1.0));
       entries = icsk.getRetainedEntries();
-      println("Intersection: " + entries);
+      println("TupleIntersection: " + entries);
       final TupleSketchIterator iiter = icsk.iterator();
       counter = 1;
       while (iiter.next()) {
@@ -188,20 +182,20 @@ public void example3() { //stateless: tuple1, tuple2, use dsso2
     @Test
     public void example4() { //stateful: tuple, theta, Mode=sum for both, use dsso0
       //Load source sketches
-      final UpdatableSketch tupleSk = tupleBldr.build();
+      final UpdatableTupleSketch tupleSk = tupleBldr.build();
       final UpdatableThetaSketch thetaSk = thetaBldr.build();
       for (int i = 1; i <= 12; i++) {
         tupleSk.update(i, 1.0);
         thetaSk.update(i + 3);
       }
 
-      //Union
-      final Union union = new Union<>(dsso0);
+      //TupleUnion
+      final TupleUnion union = new TupleUnion<>(dsso0);
       union.union(tupleSk);
       union.union(thetaSk, ufactory.newSummary().update(1.0));
-      final CompactSketch ucsk = union.getResult();
+      final CompactTupleSketch ucsk = union.getResult();
       int entries = ucsk.getRetainedEntries();
-      println("Union Stateful: tuple, theta: " + entries);
+      println("TupleUnion Stateful: tuple, theta: " + entries);
       final TupleSketchIterator uiter = ucsk.iterator();
       int counter = 1;
       int twos = 0;
@@ -215,13 +209,13 @@ public void example4() { //stateful: tuple, theta, Mode=sum for both, use dsso0
       assertEquals(ones, 6);
       assertEquals(twos, 9);
 
-      //Intersection
-      final Intersection inter = new Intersection<>(dsso0);
+      //TupleIntersection
+      final TupleIntersection inter = new TupleIntersection<>(dsso0);
       inter.intersect(tupleSk);
       inter.intersect(thetaSk, ifactory.newSummary().update(1.0));
-      final CompactSketch icsk = inter.getResult();
+      final CompactTupleSketch icsk = inter.getResult();
       entries = icsk.getRetainedEntries();
-      println("Intersection Stateful: tuple, theta: " + entries);
+      println("TupleIntersection Stateful: tuple, theta: " + entries);
       final TupleSketchIterator iiter = icsk.iterator();
       counter = 1;
       while (iiter.next()) {
@@ -234,20 +228,20 @@ public void example4() { //stateful: tuple, theta, Mode=sum for both, use dsso0
     @Test
     public void example5() { //stateful, tuple, theta, Mode=sum for both, use dsso1
       //Load source sketches
-      final UpdatableSketch tupleSk = tupleBldr.build();
+      final UpdatableTupleSketch tupleSk = tupleBldr.build();
       final UpdatableThetaSketch thetaSk = thetaBldr.build();
       for (int i = 1; i <= 12; i++) {
         tupleSk.update(i, 1.0);
         thetaSk.update(i + 3);
       }
 
-      //Union
-      final Union union = new Union<>(dsso1);
+      //TupleUnion
+      final TupleUnion union = new TupleUnion<>(dsso1);
       union.union(tupleSk);
       union.union(thetaSk, ufactory.newSummary().update(1.0));
-      final CompactSketch ucsk = union.getResult();
+      final CompactTupleSketch ucsk = union.getResult();
       int entries = ucsk.getRetainedEntries();
-      println("Union Stateful: tuple, theta: " + entries);
+      println("TupleUnion Stateful: tuple, theta: " + entries);
       final TupleSketchIterator uiter = ucsk.iterator();
       int counter = 1;
       int twos = 0;
@@ -261,13 +255,13 @@ public void example5() { //stateful, tuple, theta, Mode=sum for both, use dsso1
       assertEquals(ones, 6);
       assertEquals(twos, 9);
 
-      //Intersection
-      final Intersection inter = new Intersection<>(dsso1);
+      //TupleIntersection
+      final TupleIntersection inter = new TupleIntersection<>(dsso1);
       inter.intersect(tupleSk);
       inter.intersect(thetaSk, ifactory.newSummary().update(1.0));
-      final CompactSketch icsk = inter.getResult();
+      final CompactTupleSketch icsk = inter.getResult();
       entries = icsk.getRetainedEntries();
-      println("Intersection Stateful: tuple, theta: " + entries);
+      println("TupleIntersection Stateful: tuple, theta: " + entries);
       final TupleSketchIterator iiter = icsk.iterator();
       counter = 1;
       while (iiter.next()) {
diff --git a/src/test/java/org/apache/datasketches/tuple/TupleExamplesTest.java b/src/test/java/org/apache/datasketches/tuple/TupleExamplesTest.java
index a08908a9d..726683626 100644
--- a/src/test/java/org/apache/datasketches/tuple/TupleExamplesTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/TupleExamplesTest.java
@@ -22,17 +22,11 @@
 import static org.testng.Assert.assertEquals;
 
 import org.apache.datasketches.theta.UpdatableThetaSketch;
-import org.apache.datasketches.theta.UpdateSketchBuilder;
-import org.apache.datasketches.tuple.CompactSketch;
-import org.apache.datasketches.tuple.Intersection;
-import org.apache.datasketches.tuple.TupleSketchIterator;
-import org.apache.datasketches.tuple.Union;
-import org.apache.datasketches.tuple.UpdatableSketch;
-import org.apache.datasketches.tuple.UpdatableSketchBuilder;
+import org.apache.datasketches.theta.UpdatableThetaSketchBuilder;
 import org.apache.datasketches.tuple.aninteger.IntegerSummary;
+import org.apache.datasketches.tuple.aninteger.IntegerSummary.Mode;
 import org.apache.datasketches.tuple.aninteger.IntegerSummaryFactory;
 import org.apache.datasketches.tuple.aninteger.IntegerSummarySetOperations;
-import org.apache.datasketches.tuple.aninteger.IntegerSummary.Mode;
 import org.testng.annotations.Test;
 
 /**
@@ -45,28 +39,28 @@ public class TupleExamplesTest {
   private final IntegerSummarySetOperations isso = new IntegerSummarySetOperations(umode, imode);
   private final IntegerSummaryFactory ufactory = new IntegerSummaryFactory(umode);
   private final IntegerSummaryFactory ifactory = new IntegerSummaryFactory(imode);
-  private final UpdateSketchBuilder thetaBldr = UpdatableThetaSketch.builder();
-  private final UpdatableSketchBuilder tupleBldr =
-      new UpdatableSketchBuilder<>(ufactory);
+  private final UpdatableThetaSketchBuilder thetaBldr = UpdatableThetaSketch.builder();
+  private final UpdatableTupleSketchBuilder tupleBldr =
+      new UpdatableTupleSketchBuilder<>(ufactory);
 
 
   @Test
   public void example1() {
     //Load source sketches
-    final UpdatableSketch tupleSk = tupleBldr.build();
+    final UpdatableTupleSketch tupleSk = tupleBldr.build();
     final UpdatableThetaSketch thetaSk = thetaBldr.build();
     for (int i = 1; i <= 12; i++) {
       tupleSk.update(i, 1);
       thetaSk.update(i + 3);
     }
 
-    //Union stateful: tuple, theta
-    final Union union = new Union<>(isso);
+    //TupleUnion stateful: tuple, theta
+    final TupleUnion union = new TupleUnion<>(isso);
     union.union(tupleSk);
     union.union(thetaSk, ufactory.newSummary().update(1));
-    final CompactSketch ucsk = union.getResult();
+    final CompactTupleSketch ucsk = union.getResult();
     int entries = ucsk.getRetainedEntries();
-    println("Union Stateful: tuple, theta: " + entries);
+    println("TupleUnion Stateful: tuple, theta: " + entries);
     final TupleSketchIterator uiter = ucsk.iterator();
     int counter = 1;
     int twos = 0;
@@ -80,13 +74,13 @@ public void example1() {
     assertEquals(ones, 6);
     assertEquals(twos, 9);
 
-    //Intersection stateful: tuple, theta
-    final Intersection inter = new Intersection<>(isso);
+    //TupleIntersection stateful: tuple, theta
+    final TupleIntersection inter = new TupleIntersection<>(isso);
     inter.intersect(tupleSk);
     inter.intersect(thetaSk, ifactory.newSummary().update(1));
-    final CompactSketch icsk = inter.getResult();
+    final CompactTupleSketch icsk = inter.getResult();
     entries = icsk.getRetainedEntries();
-    println("Intersection Stateful: tuple, theta: " + entries);
+    println("TupleIntersection Stateful: tuple, theta: " + entries);
     final TupleSketchIterator iiter = icsk.iterator();
     counter = 1;
     while (iiter.next()) {
@@ -99,19 +93,19 @@ public void example1() {
   @Test
   public void example2() {
     //Load source sketches
-    final UpdatableSketch tupleSk1 = tupleBldr.build();
-    final UpdatableSketch tupleSk2 = tupleBldr.build();
+    final UpdatableTupleSketch tupleSk1 = tupleBldr.build();
+    final UpdatableTupleSketch tupleSk2 = tupleBldr.build();
 
     for (int i = 1; i <= 12; i++) {
       tupleSk1.update(i, 1);
       tupleSk2.update(i + 3, 1);
     }
 
-    //Union, stateless: tuple1, tuple2
-    final Union union = new Union<>(isso);
-    final CompactSketch ucsk = union.union(tupleSk1, tupleSk2);
+    //TupleUnion, stateless: tuple1, tuple2
+    final TupleUnion union = new TupleUnion<>(isso);
+    final CompactTupleSketch ucsk = union.union(tupleSk1, tupleSk2);
     int entries = ucsk.getRetainedEntries();
-    println("Union: " + entries);
+    println("TupleUnion: " + entries);
     final TupleSketchIterator uiter = ucsk.iterator();
     int counter = 1;
     int twos = 0;
@@ -125,11 +119,11 @@ public void example2() {
     assertEquals(ones, 6);
     assertEquals(twos, 9);
 
-    //Intersection stateless: tuple1, tuple2
-    final Intersection inter = new Intersection<>(isso);
-    final CompactSketch icsk = inter.intersect(tupleSk1, tupleSk2);
+    //TupleIntersection stateless: tuple1, tuple2
+    final TupleIntersection inter = new TupleIntersection<>(isso);
+    final CompactTupleSketch icsk = inter.intersect(tupleSk1, tupleSk2);
     entries = icsk.getRetainedEntries();
-    println("Intersection: " + entries);
+    println("TupleIntersection: " + entries);
     final TupleSketchIterator iiter = icsk.iterator();
     counter = 1;
     while (iiter.next()) {
@@ -142,19 +136,19 @@ public void example2() {
   @Test
   public void example3() {
     //Load source sketches
-    final UpdatableSketch tupleSk = tupleBldr.build();
+    final UpdatableTupleSketch tupleSk = tupleBldr.build();
     final UpdatableThetaSketch thetaSk = thetaBldr.build();
     for (int i = 1; i <= 12; i++) {
       tupleSk.update(i, 1);
       thetaSk.update(i + 3);
     }
 
-    //Union, stateless: tuple1, tuple2
-    final Union union = new Union<>(isso);
-    final CompactSketch ucsk =
+    //TupleUnion, stateless: tuple1, tuple2
+    final TupleUnion union = new TupleUnion<>(isso);
+    final CompactTupleSketch ucsk =
         union.union(tupleSk, thetaSk, ufactory.newSummary().update(1));
     int entries = ucsk.getRetainedEntries();
-    println("Union: " + entries);
+    println("TupleUnion: " + entries);
     final TupleSketchIterator uiter = ucsk.iterator();
     int counter = 1;
     int twos = 0;
@@ -168,12 +162,12 @@ public void example3() {
     assertEquals(ones, 6);
     assertEquals(twos, 9);
 
-    //Intersection stateless: tuple1, tuple2
-    final Intersection inter = new Intersection<>(isso);
-    final CompactSketch icsk =
+    //TupleIntersection stateless: tuple1, tuple2
+    final TupleIntersection inter = new TupleIntersection<>(isso);
+    final CompactTupleSketch icsk =
         inter.intersect(tupleSk, thetaSk, ufactory.newSummary().update(1));
     entries = icsk.getRetainedEntries();
-    println("Intersection: " + entries);
+    println("TupleIntersection: " + entries);
     final TupleSketchIterator iiter = icsk.iterator();
     counter = 1;
     while (iiter.next()) {
diff --git a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleAnotBTest.java b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleAnotBTest.java
index 90047237a..c3b701275 100644
--- a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleAnotBTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleAnotBTest.java
@@ -24,16 +24,15 @@
 import static org.testng.Assert.fail;
 
 import org.apache.datasketches.common.SketchesArgumentException;
+import org.apache.datasketches.theta.ThetaSketch;
 import org.apache.datasketches.theta.UpdatableThetaSketch;
-import org.apache.datasketches.theta.UpdateSketchBuilder;
-import org.apache.datasketches.tuple.AnotB;
-import org.apache.datasketches.tuple.CompactSketch;
-import org.apache.datasketches.tuple.Sketch;
+import org.apache.datasketches.theta.UpdatableThetaSketchBuilder;
+import org.apache.datasketches.tuple.TupleAnotB;
+import org.apache.datasketches.tuple.CompactTupleSketch;
+import org.apache.datasketches.tuple.TupleSketch;
 import org.apache.datasketches.tuple.TupleSketchIterator;
-import org.apache.datasketches.tuple.UpdatableSketch;
-import org.apache.datasketches.tuple.UpdatableSketchBuilder;
-import org.apache.datasketches.tuple.adouble.DoubleSummary;
-import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
+import org.apache.datasketches.tuple.UpdatableTupleSketch;
+import org.apache.datasketches.tuple.UpdatableTupleSketchBuilder;
 import org.apache.datasketches.tuple.adouble.DoubleSummary.Mode;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -46,13 +45,13 @@ public class AdoubleAnotBTest {
   private final Results results = new Results();
 
   private static void threeMethodsWithTheta(
-      final AnotB aNotB,
-      final Sketch skA,
-      final Sketch skB,
-      final org.apache.datasketches.theta.ThetaSketch skThetaB,
+      final TupleAnotB aNotB,
+      final TupleSketch skA,
+      final TupleSketch skB,
+      final ThetaSketch skThetaB,
       final Results results)
   {
-    CompactSketch result;
+    CompactTupleSketch result;
 
     //Stateful, A = Tuple, B = Tuple
     if (skA != null) {
@@ -68,21 +67,21 @@ private static void threeMethodsWithTheta(
     //Stateless A = Tuple, B = Tuple
     if (skA == null || skB == null) {
       try {
-        result = AnotB.aNotB(skA, skB);
+        result = TupleAnotB.aNotB(skA, skB);
         fail();
       }
       catch (final SketchesArgumentException e) { }
     } else {
-      result = AnotB.aNotB(skA, skB);
+      result = TupleAnotB.aNotB(skA, skB);
       results.check(result);
     }
 
     //Stateless A = Tuple, B = Theta
     if (skA == null || skThetaB == null) {
-      try { result = AnotB.aNotB(skA, skThetaB); fail(); }
+      try { result = TupleAnotB.aNotB(skA, skThetaB); fail(); }
       catch (final SketchesArgumentException e) { }
     } else {
-      result = AnotB.aNotB(skA, skThetaB);
+      result = TupleAnotB.aNotB(skA, skThetaB);
       results.check(result);
     }
 
@@ -130,7 +129,7 @@ Results set(final int retEnt, final boolean empty,
       return this;
     }
 
-    void check(final CompactSketch result) {
+    void check(final CompactTupleSketch result) {
       assertEquals(result.getRetainedEntries(), retEnt);
       assertEquals(result.isEmpty(), empty);
       if (result.getTheta() < 1.0) {
@@ -150,24 +149,24 @@ void check(final CompactSketch result) {
     }
   } //End class Results
 
-  private static UpdatableSketch buildUpdatableTuple() {
-    return new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+  private static UpdatableTupleSketch buildUpdatableTuple() {
+    return new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
   }
 
   private static UpdatableThetaSketch buildUpdateTheta() {
-    return new UpdateSketchBuilder().build();
+    return new UpdatableThetaSketchBuilder().build();
   }
 
   /*****************************************/
 
   @Test
   public void aNotBNullEmptyCombinations() {
-    final AnotB aNotB = new AnotB<>();
+    final TupleAnotB aNotB = new TupleAnotB<>();
     // calling getResult() before calling update() should yield an empty set
-    final CompactSketch result = aNotB.getResult(true);
+    final CompactTupleSketch result = aNotB.getResult(true);
     results.set(0, true, 0.0, 0.0, 0.0).check(result);
 
-    final UpdatableSketch sketch = buildUpdatableTuple();
+    final UpdatableTupleSketch sketch = buildUpdatableTuple();
     final UpdatableThetaSketch skTheta = buildUpdateTheta();
 
     threeMethodsWithTheta(aNotB, null, null, null, results);
@@ -182,11 +181,11 @@ public void aNotBNullEmptyCombinations() {
 
   @Test
   public void aNotBCheckDoubleSetAs() {
-    final UpdatableSketch skA = buildUpdatableTuple();
+    final UpdatableTupleSketch skA = buildUpdatableTuple();
     skA.update(1, 1.0);
     skA.update(2, 1.0);
-    final UpdatableSketch skA2 = buildUpdatableTuple();
-    final AnotB aNotB = new AnotB<>();
+    final UpdatableTupleSketch skA2 = buildUpdatableTuple();
+    final TupleAnotB aNotB = new TupleAnotB<>();
     aNotB.setA(skA);
     assertEquals(aNotB.getResult(false).isEmpty(), false);
     aNotB.setA(skA2);
@@ -195,28 +194,28 @@ public void aNotBCheckDoubleSetAs() {
 
   @Test
   public void aNotBEmptyExact() {
-    final UpdatableSketch sketchA = buildUpdatableTuple();
-    final UpdatableSketch sketchB = buildUpdatableTuple();
+    final UpdatableTupleSketch sketchA = buildUpdatableTuple();
+    final UpdatableTupleSketch sketchB = buildUpdatableTuple();
     sketchB.update(1, 1.0);
     sketchB.update(2, 1.0);
     final UpdatableThetaSketch skThetaB = buildUpdateTheta();
     skThetaB.update(1);
     skThetaB.update(2);
 
-    final AnotB aNotB = new AnotB<>();
+    final TupleAnotB aNotB = new TupleAnotB<>();
     results.set(0, true, 0.0, 0.0, 0.0);
     threeMethodsWithTheta(aNotB, sketchA, sketchB, skThetaB, results);
   }
 
   @Test
   public void aNotBExactEmpty() {
-    final UpdatableSketch sketchA = buildUpdatableTuple();
+    final UpdatableTupleSketch sketchA = buildUpdatableTuple();
     sketchA.update(1, 1.0);
     sketchA.update(2, 1.0);
-    final UpdatableSketch sketchB = buildUpdatableTuple();
+    final UpdatableTupleSketch sketchB = buildUpdatableTuple();
     final UpdatableThetaSketch skThetaB = buildUpdateTheta();
 
-    final AnotB aNotB = new AnotB<>();
+    final TupleAnotB aNotB = new TupleAnotB<>();
     results.set(2, false, 2.0, 0.0, 1.0);
     threeMethodsWithTheta(aNotB, sketchA, sketchB, skThetaB, results);
 
@@ -226,13 +225,13 @@ public void aNotBExactEmpty() {
 
   @Test
   public void aNotBExactOverlap() {
-    final UpdatableSketch sketchA = buildUpdatableTuple();
+    final UpdatableTupleSketch sketchA = buildUpdatableTuple();
     sketchA.update(1, 1.0);
     sketchA.update(1, 1.0);
     sketchA.update(2, 1.0);
     sketchA.update(2, 1.0);
 
-    final UpdatableSketch sketchB = buildUpdatableTuple();
+    final UpdatableTupleSketch sketchB = buildUpdatableTuple();
     sketchB.update(2, 1.0);
     sketchB.update(2, 1.0);
     sketchB.update(3, 1.0);
@@ -242,19 +241,19 @@ public void aNotBExactOverlap() {
     skThetaB.update(2);
     skThetaB.update(3);
 
-    final AnotB aNotB = new AnotB<>();
+    final TupleAnotB aNotB = new TupleAnotB<>();
     results.set(1, false, 1.0, 0.0, 2.0);
     threeMethodsWithTheta(aNotB, sketchA, sketchB, skThetaB, results);
   }
 
   @Test
   public void aNotBEstimationOverlap() {
-    final UpdatableSketch sketchA = buildUpdatableTuple();
+    final UpdatableTupleSketch sketchA = buildUpdatableTuple();
     for (int i = 0; i < 8192; i++) {
       sketchA.update(i, 1.0);
     }
 
-    final UpdatableSketch sketchB = buildUpdatableTuple();
+    final UpdatableTupleSketch sketchB = buildUpdatableTuple();
     for (int i = 0; i < 4096; i++) {
       sketchB.update(i, 1.0);
     }
@@ -264,7 +263,7 @@ public void aNotBEstimationOverlap() {
       skThetaB.update(i);
     }
 
-    final AnotB aNotB = new AnotB<>();
+    final TupleAnotB aNotB = new TupleAnotB<>();
     results.set(2123, false, 4096.0, 0.03, 1.0);
     threeMethodsWithTheta(aNotB, sketchA, sketchB, skThetaB, results);
 
@@ -274,12 +273,12 @@ public void aNotBEstimationOverlap() {
 
   @Test
   public void aNotBEstimationOverlapLargeB() {
-    final UpdatableSketch sketchA = buildUpdatableTuple();
+    final UpdatableTupleSketch sketchA = buildUpdatableTuple();
     for (int i = 0; i < 10_000; i++) {
       sketchA.update(i, 1.0);
     }
 
-    final UpdatableSketch sketchB = buildUpdatableTuple();
+    final UpdatableTupleSketch sketchB = buildUpdatableTuple();
     for (int i = 0; i < 100_000; i++) {
       sketchB.update(i + 8000, 1.0);
     }
@@ -290,7 +289,7 @@ public void aNotBEstimationOverlapLargeB() {
     }
 
     final int expected = 8_000;
-    final AnotB aNotB = new AnotB<>();
+    final TupleAnotB aNotB = new TupleAnotB<>();
     results.set(376, false, expected, 0.1, 1.0);
     threeMethodsWithTheta(aNotB, sketchA, sketchB, skThetaB, results);
 
diff --git a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleIntersectionTest.java b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleIntersectionTest.java
index acf8036e4..a01690cf4 100644
--- a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleIntersectionTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleIntersectionTest.java
@@ -24,14 +24,13 @@
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.SketchesStateException;
 import org.apache.datasketches.theta.UpdatableThetaSketch;
-import org.apache.datasketches.theta.UpdateSketchBuilder;
-import org.apache.datasketches.tuple.CompactSketch;
-import org.apache.datasketches.tuple.Intersection;
-import org.apache.datasketches.tuple.Sketch;
-import org.apache.datasketches.tuple.Sketches;
+import org.apache.datasketches.theta.UpdatableThetaSketchBuilder;
+import org.apache.datasketches.tuple.CompactTupleSketch;
+import org.apache.datasketches.tuple.TupleIntersection;
+import org.apache.datasketches.tuple.TupleSketch;
 import org.apache.datasketches.tuple.TupleSketchIterator;
-import org.apache.datasketches.tuple.UpdatableSketch;
-import org.apache.datasketches.tuple.UpdatableSketchBuilder;
+import org.apache.datasketches.tuple.UpdatableTupleSketch;
+import org.apache.datasketches.tuple.UpdatableTupleSketchBuilder;
 import org.apache.datasketches.tuple.adouble.DoubleSummary;
 import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
 import org.apache.datasketches.tuple.adouble.DoubleSummarySetOperations;
@@ -47,14 +46,14 @@ public class AdoubleIntersectionTest {
 
   @Test
   public void intersectionNotEmptyNoEntries() {
-    final UpdatableSketch sketch1 =
-        new UpdatableSketchBuilder<>
+    final UpdatableTupleSketch sketch1 =
+        new UpdatableTupleSketchBuilder<>
           (new DoubleSummaryFactory(mode)).setSamplingProbability(0.01f).build();
     sketch1.update("a", 1.0); // this happens to get rejected because of sampling with low probability
-    final Intersection intersection =
-        new Intersection<>(new DoubleSummarySetOperations(mode, mode));
+    final TupleIntersection intersection =
+        new TupleIntersection<>(new DoubleSummarySetOperations(mode, mode));
     intersection.intersect(sketch1);
-    final CompactSketch result = intersection.getResult();
+    final CompactTupleSketch result = intersection.getResult();
     Assert.assertEquals(result.getRetainedEntries(), 0);
     Assert.assertFalse(result.isEmpty());
     Assert.assertEquals(result.getEstimate(), 0.0);
@@ -64,19 +63,19 @@ public void intersectionNotEmptyNoEntries() {
 
   @Test
   public void intersectionExactWithEmpty() {
-    final UpdatableSketch sketch1 =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    final UpdatableTupleSketch sketch1 =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
     sketch1.update(1, 1.0);
     sketch1.update(2, 1.0);
     sketch1.update(3, 1.0);
 
-    final Sketch sketch2 = Sketches.createEmptySketch();
+    final TupleSketch sketch2 = TupleSketch.createEmptySketch();
 
-    final Intersection intersection =
-        new Intersection<>(new DoubleSummarySetOperations(mode, mode));
+    final TupleIntersection intersection =
+        new TupleIntersection<>(new DoubleSummarySetOperations(mode, mode));
     intersection.intersect(sketch1);
     intersection.intersect(sketch2);
-    final CompactSketch result = intersection.getResult();
+    final CompactTupleSketch result = intersection.getResult();
     Assert.assertEquals(result.getRetainedEntries(), 0);
     Assert.assertTrue(result.isEmpty());
     Assert.assertEquals(result.getEstimate(), 0.0);
@@ -86,25 +85,25 @@ public void intersectionExactWithEmpty() {
 
   @Test
   public void intersectionExactMode() {
-    UpdatableSketch sketch1 =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    UpdatableTupleSketch sketch1 =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
     sketch1.update(1, 1.0);
     sketch1.update(1, 1.0);
     sketch1.update(2, 1.0);
     sketch1.update(2, 1.0);
 
-    final UpdatableSketch sketch2 =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    final UpdatableTupleSketch sketch2 =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
     sketch2.update(2, 1.0);
     sketch2.update(2, 1.0);
     sketch2.update(3, 1.0);
     sketch2.update(3, 1.0);
 
-    final Intersection intersection =
-        new Intersection<>(new DoubleSummarySetOperations(mode, mode));
+    final TupleIntersection intersection =
+        new TupleIntersection<>(new DoubleSummarySetOperations(mode, mode));
     intersection.intersect(sketch1);
     intersection.intersect(sketch2);
-    final CompactSketch result = intersection.getResult();
+    final CompactTupleSketch result = intersection.getResult();
     Assert.assertEquals(result.getRetainedEntries(), 1);
     Assert.assertFalse(result.isEmpty());
     Assert.assertEquals(result.getEstimate(), 1.0);
@@ -126,23 +125,23 @@ public void intersectionExactMode() {
   @Test
   public void intersectionDisjointEstimationMode() {
     int key = 0;
-    final UpdatableSketch sketch1 =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    final UpdatableTupleSketch sketch1 =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
     for (int i = 0; i < 8192; i++) {
       sketch1.update(key++, 1.0);
     }
 
-    final UpdatableSketch sketch2 =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    final UpdatableTupleSketch sketch2 =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
     for (int i = 0; i < 8192; i++) {
       sketch2.update(key++, 1.0);
     }
 
-    final Intersection intersection =
-        new Intersection<>(new DoubleSummarySetOperations(mode, mode));
+    final TupleIntersection intersection =
+        new TupleIntersection<>(new DoubleSummarySetOperations(mode, mode));
     intersection.intersect(sketch1);
     intersection.intersect(sketch2);
-    CompactSketch result = intersection.getResult();
+    CompactTupleSketch result = intersection.getResult();
     Assert.assertEquals(result.getRetainedEntries(), 0);
     Assert.assertFalse(result.isEmpty());
     Assert.assertEquals(result.getEstimate(), 0.0);
@@ -162,24 +161,24 @@ public void intersectionDisjointEstimationMode() {
   @Test
   public void intersectionEstimationMode() {
     int key = 0;
-    final UpdatableSketch sketch1 =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    final UpdatableTupleSketch sketch1 =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
     for (int i = 0; i < 8192; i++) {
       sketch1.update(key++, 1.0);
     }
 
     key -= 4096; // overlap half of the entries
-    final UpdatableSketch sketch2 =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    final UpdatableTupleSketch sketch2 =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
     for (int i = 0; i < 8192; i++) {
       sketch2.update(key++, 1.0);
     }
 
-    final Intersection intersection =
-        new Intersection<>(new DoubleSummarySetOperations(mode, mode));
+    final TupleIntersection intersection =
+        new TupleIntersection<>(new DoubleSummarySetOperations(mode, mode));
     intersection.intersect(sketch1);
     intersection.intersect(sketch2);
-    final CompactSketch result = intersection.getResult();
+    final CompactTupleSketch result = intersection.getResult();
     Assert.assertFalse(result.isEmpty());
     // crude estimate of RSE(95%) = 2 / sqrt(result.getRetainedEntries())
     Assert.assertEquals(result.getEstimate(), 4096.0, 4096 * 0.03);
@@ -194,16 +193,16 @@ public void intersectionEstimationMode() {
   @Test
   public void checkExactIntersectionWithTheta() {
     final UpdatableThetaSketch thSkNull = null;
-    final UpdatableThetaSketch thSkEmpty = new UpdateSketchBuilder().build();
-    final UpdatableThetaSketch thSk10 = new UpdateSketchBuilder().build();
-    final UpdatableThetaSketch thSk15 = new UpdateSketchBuilder().build();
+    final UpdatableThetaSketch thSkEmpty = new UpdatableThetaSketchBuilder().build();
+    final UpdatableThetaSketch thSk10 = new UpdatableThetaSketchBuilder().build();
+    final UpdatableThetaSketch thSk15 = new UpdatableThetaSketchBuilder().build();
     for (int i = 0; i < 10; i++) { thSk10.update(i); }
     for (int i = 0; i < 10; i++) { thSk15.update(i + 5); } //overlap = 5
 
     DoubleSummary dsum = new DoubleSummaryFactory(mode).newSummary();
-    final Intersection intersection =
-        new Intersection<>(new DoubleSummarySetOperations(mode, mode));
-    CompactSketch result;
+    final TupleIntersection intersection =
+        new TupleIntersection<>(new DoubleSummarySetOperations(mode, mode));
+    CompactTupleSketch result;
 
     try { intersection.getResult(); fail(); }
     catch (final SketchesStateException e ) { } //OK.
@@ -240,16 +239,16 @@ public void checkExactIntersectionWithTheta() {
 
   @Test
   public void checkExactIntersectionWithThetaDisjoint() {
-    final UpdatableThetaSketch thSkA = new UpdateSketchBuilder().setLogNominalEntries(10).build();
-    final UpdatableThetaSketch thSkB = new UpdateSketchBuilder().setLogNominalEntries(10).build();
+    final UpdatableThetaSketch thSkA = new UpdatableThetaSketchBuilder().setLogNominalEntries(10).build();
+    final UpdatableThetaSketch thSkB = new UpdatableThetaSketchBuilder().setLogNominalEntries(10).build();
     int key = 0;
     for (int i = 0; i < 32;  i++) { thSkA.update(key++); }
     for (int i = 0; i < 32; i++) { thSkB.update(key++); }
 
     final DoubleSummary dsum = new DoubleSummaryFactory(mode).newSummary();
-    final Intersection intersection =
-        new Intersection<>(new DoubleSummarySetOperations(mode, mode));
-    CompactSketch result;
+    final TupleIntersection intersection =
+        new TupleIntersection<>(new DoubleSummarySetOperations(mode, mode));
+    CompactTupleSketch result;
 
     intersection.intersect(thSkA, dsum);
     intersection.intersect(thSkB, dsum);
@@ -265,15 +264,15 @@ public void checkExactIntersectionWithThetaDisjoint() {
 
   @Test
   public void checkEstimatingIntersectionWithThetaOverlapping() {
-    final UpdatableThetaSketch thSkA = new UpdateSketchBuilder().setLogNominalEntries(4).build();
-    final UpdatableThetaSketch thSkB = new UpdateSketchBuilder().setLogNominalEntries(10).build();
+    final UpdatableThetaSketch thSkA = new UpdatableThetaSketchBuilder().setLogNominalEntries(4).build();
+    final UpdatableThetaSketch thSkB = new UpdatableThetaSketchBuilder().setLogNominalEntries(10).build();
     for (int i = 0; i < 64;  i++) { thSkA.update(i); } //dense mode, low theta
     for (int i = 32; i < 96; i++) { thSkB.update(i); } //exact overlapping
 
     final DoubleSummary dsum = new DoubleSummaryFactory(mode).newSummary();
-    final Intersection intersection =
-        new Intersection<>(new DoubleSummarySetOperations(mode, mode));
-    CompactSketch result;
+    final TupleIntersection intersection =
+        new TupleIntersection<>(new DoubleSummarySetOperations(mode, mode));
+    CompactTupleSketch result;
 
     intersection.intersect(thSkA, dsum);
     intersection.intersect(thSkB, dsum);
@@ -292,12 +291,12 @@ public void checkEstimatingIntersectionWithThetaOverlapping() {
 
   @Test
   public void intersectionEmpty() {
-    final UpdatableSketch sketch =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
-    final Intersection intersection =
-        new Intersection<>(new DoubleSummarySetOperations(mode, mode));
+    final UpdatableTupleSketch sketch =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    final TupleIntersection intersection =
+        new TupleIntersection<>(new DoubleSummarySetOperations(mode, mode));
     intersection.intersect(sketch);
-    final CompactSketch result = intersection.getResult();
+    final CompactTupleSketch result = intersection.getResult();
     Assert.assertEquals(result.getRetainedEntries(), 0);
     Assert.assertTrue(result.isEmpty());
     Assert.assertEquals(result.getEstimate(), 0.0);
diff --git a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleTest.java b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleTest.java
index d66f2a044..94d25bd7d 100644
--- a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleTest.java
@@ -26,12 +26,11 @@
 
 import org.apache.datasketches.common.ResizeFactor;
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.tuple.Sketch;
-import org.apache.datasketches.tuple.Sketches;
+import org.apache.datasketches.tuple.TupleSketch;
 import org.apache.datasketches.tuple.TupleSketchIterator;
-import org.apache.datasketches.tuple.UpdatableSketch;
-import org.apache.datasketches.tuple.UpdatableSketchBuilder;
-import org.apache.datasketches.tuple.adouble.DoubleSketch;
+import org.apache.datasketches.tuple.UpdatableTupleSketch;
+import org.apache.datasketches.tuple.UpdatableTupleSketchBuilder;
+import org.apache.datasketches.tuple.adouble.DoubleTupleSketch;
 import org.apache.datasketches.tuple.adouble.DoubleSummary;
 import org.apache.datasketches.tuple.adouble.DoubleSummaryDeserializer;
 import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
@@ -45,7 +44,7 @@ public class AdoubleTest {
   @Test
   public void isEmpty() {
     final int lgK = 12;
-    final DoubleSketch sketch = new DoubleSketch(lgK, mode);
+    final DoubleTupleSketch sketch = new DoubleTupleSketch(lgK, mode);
     Assert.assertTrue(sketch.isEmpty());
     Assert.assertFalse(sketch.isEstimationMode());
     Assert.assertEquals(sketch.getEstimate(), 0.0);
@@ -61,10 +60,10 @@ public void isEmpty() {
 
   @Test
   public void checkLowK() {
-    final UpdatableSketchBuilder bldr = new UpdatableSketchBuilder<>(
+    final UpdatableTupleSketchBuilder bldr = new UpdatableTupleSketchBuilder<>(
         new DoubleSummaryFactory(Mode.Sum));
     bldr.setNominalEntries(16);
-    final UpdatableSketch sk = bldr.build();
+    final UpdatableTupleSketch sk = bldr.build();
     assertEquals(sk.getLgK(), 4);
   }
 
@@ -73,14 +72,14 @@ public void checkLowK() {
   public void serDeTest() {
     final int lgK = 12;
     final int K = 1 << lgK;
-    final DoubleSketch a1Sk = new DoubleSketch(lgK, Mode.AlwaysOne);
+    final DoubleTupleSketch a1Sk = new DoubleTupleSketch(lgK, Mode.AlwaysOne);
     final int m = 2 * K;
     for (int key = 0; key < m; key++) {
       a1Sk.update(key, 1.0);
     }
     final double est1 = a1Sk.getEstimate();
     final MemorySegment seg = MemorySegment.ofArray(a1Sk.toByteArray());
-    final DoubleSketch a1Sk2 = new DoubleSketch(seg, Mode.AlwaysOne);
+    final DoubleTupleSketch a1Sk2 = new DoubleTupleSketch(seg, Mode.AlwaysOne);
     final double est2 = a1Sk2.getEstimate();
     assertEquals(est1, est2);
   }
@@ -89,7 +88,7 @@ public void serDeTest() {
   public void checkStringKey() {
     final int lgK = 12;
     final int K = 1 << lgK;
-    final DoubleSketch a1Sk1 = new DoubleSketch(lgK, Mode.AlwaysOne);
+    final DoubleTupleSketch a1Sk1 = new DoubleTupleSketch(lgK, Mode.AlwaysOne);
     final int m = K / 2;
     for (int key = 0; key < m; key++) {
       a1Sk1.update(Integer.toHexString(key), 1.0);
@@ -101,8 +100,8 @@ public void checkStringKey() {
   @Test
   public void isEmptyWithSampling() {
     final float samplingProbability = 0.1f;
-    final UpdatableSketch sketch =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode))
+    final UpdatableTupleSketch sketch =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode))
           .setSamplingProbability(samplingProbability).build();
     Assert.assertTrue(sketch.isEmpty());
     Assert.assertFalse(sketch.isEstimationMode());
@@ -116,8 +115,8 @@ public void isEmptyWithSampling() {
   @Test
   public void sampling() {
     final float samplingProbability = 0.001f;
-    final UpdatableSketch sketch =
-        new UpdatableSketchBuilder<>(
+    final UpdatableTupleSketch sketch =
+        new UpdatableTupleSketchBuilder<>(
             new DoubleSummaryFactory(mode)).setSamplingProbability(samplingProbability).build();
     sketch.update("a", 1.0);
     Assert.assertFalse(sketch.isEmpty());
@@ -131,8 +130,8 @@ public void sampling() {
 
   @Test
   public void exactMode() {
-    final UpdatableSketch sketch =
-        new UpdatableSketchBuilder<>(
+    final UpdatableTupleSketch sketch =
+        new UpdatableTupleSketchBuilder<>(
             new DoubleSummaryFactory(mode)).build();
     Assert.assertTrue(sketch.isEmpty());
     Assert.assertEquals(sketch.getEstimate(), 0.0);
@@ -170,8 +169,8 @@ public void exactMode() {
   // Here we assume that presenting as many unique values as twice the nominal
   //   size of the sketch will result in estimation mode
   public void estimationMode() {
-    final UpdatableSketch sketch =
-        new UpdatableSketchBuilder<>(
+    final UpdatableTupleSketch sketch =
+        new UpdatableTupleSketchBuilder<>(
             new DoubleSummaryFactory(mode)).build();
     Assert.assertEquals(sketch.getEstimate(), 0.0);
     for (int i = 1; i <= 8192; i++) {
@@ -202,8 +201,8 @@ public void estimationMode() {
 
   @Test
   public void estimationModeWithSamplingNoResizing() {
-    final UpdatableSketch sketch =
-        new UpdatableSketchBuilder<>(
+    final UpdatableTupleSketch sketch =
+        new UpdatableTupleSketchBuilder<>(
             new DoubleSummaryFactory(mode))
               .setSamplingProbability(0.5f)
               .setResizeFactor(ResizeFactor.X1).build();
@@ -218,8 +217,8 @@ public void estimationModeWithSamplingNoResizing() {
 
   @Test
   public void updatesOfAllKeyTypes() {
-    final UpdatableSketch sketch =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    final UpdatableTupleSketch sketch =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
     sketch.update(1L, 1.0);
     sketch.update(2.0, 1.0);
     final byte[] bytes = { 3, 3 };
@@ -236,8 +235,8 @@ public void updatesOfAllKeyTypes() {
 
   @Test
   public void doubleSummaryDefaultSumMode() {
-    final UpdatableSketch sketch =
-        new UpdatableSketchBuilder<>(
+    final UpdatableTupleSketch sketch =
+        new UpdatableTupleSketchBuilder<>(
             new DoubleSummaryFactory(mode)).build();
     {
       sketch.update(1, 1.0);
@@ -267,8 +266,8 @@ public void doubleSummaryDefaultSumMode() {
 
   @Test
   public void doubleSummaryMinMode() {
-    final UpdatableSketch sketch =
-        new UpdatableSketchBuilder<>(
+    final UpdatableTupleSketch sketch =
+        new UpdatableTupleSketchBuilder<>(
             new DoubleSummaryFactory(DoubleSummary.Mode.Min)).build();
     {
       sketch.update(1, 1.0);
@@ -298,8 +297,8 @@ public void doubleSummaryMinMode() {
   @Test
 
   public void doubleSummaryMaxMode() {
-    final UpdatableSketch sketch =
-        new UpdatableSketchBuilder<>(
+    final UpdatableTupleSketch sketch =
+        new UpdatableTupleSketchBuilder<>(
             new DoubleSummaryFactory(DoubleSummary.Mode.Max)).build();
     {
       sketch.update(1, 1.0);
@@ -330,11 +329,11 @@ public void doubleSummaryMaxMode() {
   @SuppressWarnings("deprecation")
   @Test
   public void serializeDeserializeExact() throws Exception {
-    final UpdatableSketch sketch1 =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    final UpdatableTupleSketch sketch1 =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
     sketch1.update(1, 1.0);
 
-    final UpdatableSketch sketch2 = Sketches.heapifyUpdatableSketch(
+    final UpdatableTupleSketch sketch2 = TupleSketch.heapifyUpdatableSketch(
         MemorySegment.ofArray(sketch1.toByteArray()),
         new DoubleSummaryDeserializer(), new DoubleSummaryFactory(mode));
 
@@ -355,8 +354,8 @@ public void serializeDeserializeExact() throws Exception {
   @SuppressWarnings("deprecation")
   @Test
   public void serializeDeserializeEstimationNoResizing() throws Exception {
-    final UpdatableSketch sketch1 =
-        new UpdatableSketchBuilder<>(
+    final UpdatableTupleSketch sketch1 =
+        new UpdatableTupleSketchBuilder<>(
             new DoubleSummaryFactory(mode)).setResizeFactor(ResizeFactor.X1).build();
     for (int j = 0; j < 10; j++) {
       for (int i = 0; i < 8192; i++) {
@@ -369,8 +368,8 @@ public void serializeDeserializeEstimationNoResizing() throws Exception {
     //for binary testing
     //TestUtil.writeBytesToFile(bytes, "UpdatableSketchWithDoubleSummary4K.sk");
 
-    final Sketch sketch2 =
-        Sketches.heapifySketch(MemorySegment.ofArray(bytes), new DoubleSummaryDeserializer());
+    final TupleSketch sketch2 =
+        TupleSketch.heapifySketch(MemorySegment.ofArray(bytes), new DoubleSummaryDeserializer());
     Assert.assertTrue(sketch2.isEstimationMode());
     Assert.assertEquals(sketch2.getEstimate(), 8192, 8192 * 0.99);
     Assert.assertEquals(sketch1.getTheta(), sketch2.getTheta());
@@ -388,13 +387,13 @@ public void serializeDeserializeEstimationNoResizing() throws Exception {
   public void serializeDeserializeSampling() throws Exception {
     final int sketchSize = 16384;
     final int numberOfUniques = sketchSize;
-    final UpdatableSketch sketch1 =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode))
+    final UpdatableTupleSketch sketch1 =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode))
         .setNominalEntries(sketchSize).setSamplingProbability(0.5f).build();
     for (int i = 0; i < numberOfUniques; i++) {
       sketch1.update(i, 1.0);
     }
-    final Sketch sketch2 = Sketches.heapifySketch(
+    final TupleSketch sketch2 = TupleSketch.heapifySketch(
         MemorySegment.ofArray(sketch1.toByteArray()), new DoubleSummaryDeserializer());
     Assert.assertTrue(sketch2.isEstimationMode());
     Assert.assertEquals(sketch2.getEstimate() / numberOfUniques, 1.0, 0.01);
@@ -406,8 +405,8 @@ public void serializeDeserializeSampling() throws Exception {
   public void checkUpdatableSketch() {
     final DoubleSummaryFactory dsumFact = new DoubleSummaryFactory(mode);
     //DoubleSummary dsum = dsumFact.newSummary();
-    final UpdatableSketchBuilder bldr = new UpdatableSketchBuilder<>(dsumFact);
-    final UpdatableSketch usk = bldr.build();
+    final UpdatableTupleSketchBuilder bldr = new UpdatableTupleSketchBuilder<>(dsumFact);
+    final UpdatableTupleSketch usk = bldr.build();
     final byte[] byteArr = new byte[0];
     usk.update(byteArr, 0.0);
     final int[] intArr = new int[0];
@@ -418,7 +417,7 @@ public void checkUpdatableSketch() {
 
   @Test(expectedExceptions = SketchesArgumentException.class)
   public void invalidSamplingProbability() {
-    new UpdatableSketchBuilder<>
+    new UpdatableTupleSketchBuilder<>
       (new DoubleSummaryFactory(mode)).setSamplingProbability(2f).build();
   }
 
diff --git a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleUnionTest.java b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleUnionTest.java
index 94272df54..08dd421d2 100644
--- a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleUnionTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleUnionTest.java
@@ -23,12 +23,12 @@
 
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.theta.UpdatableThetaSketch;
-import org.apache.datasketches.theta.UpdateSketchBuilder;
-import org.apache.datasketches.tuple.CompactSketch;
+import org.apache.datasketches.theta.UpdatableThetaSketchBuilder;
+import org.apache.datasketches.tuple.CompactTupleSketch;
 import org.apache.datasketches.tuple.TupleSketchIterator;
-import org.apache.datasketches.tuple.Union;
-import org.apache.datasketches.tuple.UpdatableSketch;
-import org.apache.datasketches.tuple.UpdatableSketchBuilder;
+import org.apache.datasketches.tuple.TupleUnion;
+import org.apache.datasketches.tuple.UpdatableTupleSketch;
+import org.apache.datasketches.tuple.UpdatableTupleSketchBuilder;
 import org.apache.datasketches.tuple.adouble.DoubleSummary;
 import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
 import org.apache.datasketches.tuple.adouble.DoubleSummarySetOperations;
@@ -44,14 +44,14 @@ public class AdoubleUnionTest {
 
   @Test
   public void unionEmptySampling() {
-    final UpdatableSketch sketch =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).setSamplingProbability(0.01f).build();
+    final UpdatableTupleSketch sketch =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).setSamplingProbability(0.01f).build();
     sketch.update(1, 1.0);
     Assert.assertEquals(sketch.getRetainedEntries(), 0); // not retained due to low sampling probability
 
-    final Union union = new Union<>(new DoubleSummarySetOperations(mode, mode));
+    final TupleUnion union = new TupleUnion<>(new DoubleSummarySetOperations(mode, mode));
     union.union(sketch);
-    final CompactSketch result = union.getResult();
+    final CompactTupleSketch result = union.getResult();
     Assert.assertEquals(result.getRetainedEntries(), 0);
     Assert.assertFalse(result.isEmpty());
     Assert.assertTrue(result.isEstimationMode());
@@ -60,25 +60,25 @@ public void unionEmptySampling() {
 
   @Test
   public void unionExactMode() {
-    final UpdatableSketch sketch1 =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    final UpdatableTupleSketch sketch1 =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
     sketch1.update(1, 1.0);
     sketch1.update(1, 1.0);
     sketch1.update(1, 1.0);
     sketch1.update(2, 1.0);
 
-    final UpdatableSketch sketch2 =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    final UpdatableTupleSketch sketch2 =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
     sketch2.update(2, 1.0);
     sketch2.update(2, 1.0);
     sketch2.update(3, 1.0);
     sketch2.update(3, 1.0);
     sketch2.update(3, 1.0);
 
-    final Union union = new Union<>(new DoubleSummarySetOperations(mode, mode));
+    final TupleUnion union = new TupleUnion<>(new DoubleSummarySetOperations(mode, mode));
     union.union(sketch1);
     union.union(sketch2);
-    CompactSketch result = union.getResult();
+    CompactTupleSketch result = union.getResult();
     Assert.assertEquals(result.getEstimate(), 3.0);
 
     final TupleSketchIterator it = result.iterator();
@@ -104,23 +104,23 @@ public void unionExactMode() {
   @Test
   public void unionEstimationMode() {
     int key = 0;
-    final UpdatableSketch sketch1 =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    final UpdatableTupleSketch sketch1 =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
     for (int i = 0; i < 8192; i++) {
       sketch1.update(key++, 1.0);
     }
 
     key -= 4096; // overlap half of the entries
-    final UpdatableSketch sketch2 =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    final UpdatableTupleSketch sketch2 =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
     for (int i = 0; i < 8192; i++) {
       sketch2.update(key++, 1.0);
     }
 
-    final Union union = new Union<>(4096, new DoubleSummarySetOperations(mode, mode));
+    final TupleUnion union = new TupleUnion<>(4096, new DoubleSummarySetOperations(mode, mode));
     union.union(sketch1);
     union.union(sketch2);
-    final CompactSketch result = union.getResult();
+    final CompactTupleSketch result = union.getResult();
     Assert.assertEquals(result.getEstimate(), 12288.0, 12288 * 0.01);
     Assert.assertTrue(result.getLowerBound(1) <= result.getEstimate());
     Assert.assertTrue(result.getUpperBound(1) > result.getEstimate());
@@ -129,26 +129,26 @@ public void unionEstimationMode() {
   @Test
   public void unionMixedMode() {
     int key = 0;
-    final UpdatableSketch sketch1 =
-        new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+    final UpdatableTupleSketch sketch1 =
+        new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
     for (int i = 0; i < 1000; i++) {
       sketch1.update(key++, 1.0);
       //System.out.println("theta1=" + sketch1.getTheta() + " " + sketch1.getThetaLong());
     }
 
     key -= 500; // overlap half of the entries
-    final UpdatableSketch sketch2 =
-        new UpdatableSketchBuilder<>
+    final UpdatableTupleSketch sketch2 =
+        new UpdatableTupleSketchBuilder<>
           (new DoubleSummaryFactory(mode)).setSamplingProbability(0.2f).build();
     for (int i = 0; i < 20000; i++) {
       sketch2.update(key++, 1.0);
       //System.out.println("theta2=" + sketch2.getTheta() + " " + sketch2.getThetaLong());
     }
 
-    final Union union = new Union<>(4096, new DoubleSummarySetOperations(mode, mode));
+    final TupleUnion union = new TupleUnion<>(4096, new DoubleSummarySetOperations(mode, mode));
     union.union(sketch1);
     union.union(sketch2);
-    final CompactSketch result = union.getResult();
+    final CompactTupleSketch result = union.getResult();
     Assert.assertEquals(result.getEstimate(), 20500.0, 20500 * 0.01);
     Assert.assertTrue(result.getLowerBound(1) <= result.getEstimate());
     Assert.assertTrue(result.getUpperBound(1) > result.getEstimate());
@@ -156,14 +156,14 @@ public void unionMixedMode() {
 
   @Test
   public void checkUnionUpdateWithTheta() {
-    final Union union = new Union<>(new DoubleSummarySetOperations(mode, mode));
+    final TupleUnion union = new TupleUnion<>(new DoubleSummarySetOperations(mode, mode));
     UpdatableThetaSketch usk = null;
     DoubleSummary dsum = null;
 
     try { union.union(usk, dsum); fail(); }
     catch (final SketchesArgumentException e) { }
 
-    usk = new UpdateSketchBuilder().build();
+    usk = new UpdatableThetaSketchBuilder().build();
     try { union.union(usk, dsum); fail(); }
     catch (final SketchesArgumentException e) { }
 
diff --git a/src/test/java/org/apache/datasketches/tuple/adouble/FilterTest.java b/src/test/java/org/apache/datasketches/tuple/adouble/FilterTest.java
index 5e4f24d8e..269583df4 100644
--- a/src/test/java/org/apache/datasketches/tuple/adouble/FilterTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/adouble/FilterTest.java
@@ -22,10 +22,9 @@
 import java.util.Random;
 
 import org.apache.datasketches.tuple.Filter;
-import org.apache.datasketches.tuple.Sketch;
-import org.apache.datasketches.tuple.Sketches;
-import org.apache.datasketches.tuple.UpdatableSketch;
-import org.apache.datasketches.tuple.UpdatableSketchBuilder;
+import org.apache.datasketches.tuple.TupleSketch;
+import org.apache.datasketches.tuple.UpdatableTupleSketch;
+import org.apache.datasketches.tuple.UpdatableTupleSketchBuilder;
 import org.apache.datasketches.tuple.adouble.DoubleSummary;
 import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
 import org.apache.datasketches.tuple.adouble.DoubleSummary.Mode;
@@ -39,11 +38,11 @@ public class FilterTest {
 
     @Test
     public void emptySketch() {
-        final Sketch sketch = Sketches.createEmptySketch();
+        final TupleSketch sketch = TupleSketch.createEmptySketch();
 
         final Filter filter = new Filter<>(o -> true);
 
-        final Sketch filteredSketch = filter.filter(sketch);
+        final TupleSketch filteredSketch = filter.filter(sketch);
 
         Assert.assertEquals(filteredSketch.getEstimate(), 0.0);
         Assert.assertEquals(filteredSketch.getThetaLong(), sketch.getThetaLong());
@@ -56,7 +55,7 @@ public void emptySketch() {
     public void nullSketch() {
         final Filter filter = new Filter<>(o -> true);
 
-        final Sketch filteredSketch = filter.filter(null);
+        final TupleSketch filteredSketch = filter.filter(null);
 
         Assert.assertEquals(filteredSketch.getEstimate(), 0.0);
         Assert.assertEquals(filteredSketch.getThetaLong(), Long.MAX_VALUE);
@@ -67,14 +66,14 @@ public void nullSketch() {
 
     @Test
     public void filledSketchShouldBehaveTheSame() {
-        final UpdatableSketch sketch =
-            new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+        final UpdatableTupleSketch sketch =
+            new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
 
         fillSketch(sketch, numberOfElements, 0.0);
 
         final Filter filter = new Filter<>(o -> true);
 
-        final Sketch filteredSketch = filter.filter(sketch);
+        final TupleSketch filteredSketch = filter.filter(sketch);
 
         Assert.assertEquals(filteredSketch.getEstimate(), sketch.getEstimate());
         Assert.assertEquals(filteredSketch.getThetaLong(), sketch.getThetaLong());
@@ -85,15 +84,15 @@ public void filledSketchShouldBehaveTheSame() {
 
     @Test
     public void filledSketchShouldFilterOutElements() {
-        final UpdatableSketch sketch =
-            new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+        final UpdatableTupleSketch sketch =
+            new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
 
         fillSketch(sketch, numberOfElements, 0.0);
         fillSketch(sketch, 2 * numberOfElements, 1.0);
 
         final Filter filter = new Filter<>(o -> o.getValue() < 0.5);
 
-        final Sketch filteredSketch = filter.filter(sketch);
+        final TupleSketch filteredSketch = filter.filter(sketch);
 
         Assert.assertEquals(filteredSketch.getEstimate(), numberOfElements);
         Assert.assertEquals(filteredSketch.getThetaLong(), sketch.getThetaLong());
@@ -104,8 +103,8 @@ public void filledSketchShouldFilterOutElements() {
 
     @Test
     public void filteringInEstimationMode() {
-        final UpdatableSketch sketch =
-            new UpdatableSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
+        final UpdatableTupleSketch sketch =
+            new UpdatableTupleSketchBuilder<>(new DoubleSummaryFactory(mode)).build();
 
         final int n = 10000;
         fillSketch(sketch, n, 0.0);
@@ -113,7 +112,7 @@ public void filteringInEstimationMode() {
 
         final Filter filter = new Filter<>(o -> o.getValue() < 0.5);
 
-        final Sketch filteredSketch = filter.filter(sketch);
+        final TupleSketch filteredSketch = filter.filter(sketch);
 
         Assert.assertEquals(filteredSketch.getEstimate(), n, n * 0.05);
         Assert.assertEquals(filteredSketch.getThetaLong(), sketch.getThetaLong());
@@ -124,8 +123,8 @@ public void filteringInEstimationMode() {
 
     @Test
     public void nonEmptySketchWithNoEntries() {
-      final UpdatableSketch sketch =
-          new UpdatableSketchBuilder<>(
+      final UpdatableTupleSketch sketch =
+          new UpdatableTupleSketchBuilder<>(
               new DoubleSummaryFactory(mode)).setSamplingProbability(0.0001f).build();
       sketch.update(0, 0.0);
 
@@ -134,7 +133,7 @@ public void nonEmptySketchWithNoEntries() {
 
       final Filter filter = new Filter<>(o -> true);
 
-      final Sketch filteredSketch = filter.filter(sketch);
+      final TupleSketch filteredSketch = filter.filter(sketch);
 
       Assert.assertFalse(filteredSketch.isEmpty());
       Assert.assertEquals(filteredSketch.getEstimate(), sketch.getEstimate());
@@ -143,7 +142,7 @@ public void nonEmptySketchWithNoEntries() {
       Assert.assertEquals(filteredSketch.getUpperBound(1), sketch.getUpperBound(1));
     }
 
-    private static void fillSketch(final UpdatableSketch sketch,
+    private static void fillSketch(final UpdatableTupleSketch sketch,
         final int numberOfElements, final Double sketchValue) {
 
 
diff --git a/src/test/java/org/apache/datasketches/tuple/aninteger/CornerCaseTupleSetOperationsTest.java b/src/test/java/org/apache/datasketches/tuple/aninteger/CornerCaseTupleSetOperationsTest.java
index 6fd6a28cc..56dd73595 100644
--- a/src/test/java/org/apache/datasketches/tuple/aninteger/CornerCaseTupleSetOperationsTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/aninteger/CornerCaseTupleSetOperationsTest.java
@@ -25,14 +25,11 @@
 import org.apache.datasketches.common.ResizeFactor;
 import org.apache.datasketches.common.Util;
 import org.apache.datasketches.theta.UpdatableThetaSketch;
-import org.apache.datasketches.theta.UpdateSketchBuilder;
-import org.apache.datasketches.tuple.AnotB;
-import org.apache.datasketches.tuple.CompactSketch;
-import org.apache.datasketches.tuple.Intersection;
-import org.apache.datasketches.tuple.Union;
-import org.apache.datasketches.tuple.aninteger.IntegerSketch;
-import org.apache.datasketches.tuple.aninteger.IntegerSummary;
-import org.apache.datasketches.tuple.aninteger.IntegerSummarySetOperations;
+import org.apache.datasketches.theta.UpdatableThetaSketchBuilder;
+import org.apache.datasketches.tuple.CompactTupleSketch;
+import org.apache.datasketches.tuple.TupleAnotB;
+import org.apache.datasketches.tuple.TupleIntersection;
+import org.apache.datasketches.tuple.TupleUnion;
 import org.testng.annotations.Test;
 
 public class CornerCaseTupleSetOperationsTest {
@@ -74,8 +71,8 @@ private enum SkType {
 
   @Test
   public void emptyEmpty() {
-    IntegerSketch tupleA = getTupleSketch(SkType.EMPTY, 0, 0);
-    IntegerSketch tupleB = getTupleSketch(SkType.EMPTY, 0, 0);
+    IntegerTupleSketch tupleA = getTupleSketch(SkType.EMPTY, 0, 0);
+    IntegerTupleSketch tupleB = getTupleSketch(SkType.EMPTY, 0, 0);
     UpdatableThetaSketch thetaB =  getThetaSketch(SkType.EMPTY, 0, 0);
     final double expectedIntersectTheta = 1.0;
     final int expectedIntersectCount = 0;
@@ -95,8 +92,8 @@ public void emptyEmpty() {
 
   @Test
   public void emptyExact() {
-    IntegerSketch tupleA = getTupleSketch(SkType.EMPTY, 0, 0);
-    IntegerSketch tupleB = getTupleSketch(SkType.EXACT, 0, GT_MIDP_V);
+    IntegerTupleSketch tupleA = getTupleSketch(SkType.EMPTY, 0, 0);
+    IntegerTupleSketch tupleB = getTupleSketch(SkType.EXACT, 0, GT_MIDP_V);
     UpdatableThetaSketch thetaB =  getThetaSketch(SkType.EXACT, 0, GT_MIDP_V);
     final double expectedIntersectTheta = 1.0;
     final int expectedIntersectCount = 0;
@@ -116,8 +113,8 @@ public void emptyExact() {
 
   @Test
   public void EmptyDegenerate() {
-    IntegerSketch tupleA = getTupleSketch(SkType.EMPTY, 0, 0);
-    IntegerSketch tupleB = getTupleSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
+    IntegerTupleSketch tupleA = getTupleSketch(SkType.EMPTY, 0, 0);
+    IntegerTupleSketch tupleB = getTupleSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
     UpdatableThetaSketch thetaB =  getThetaSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
     final double expectedIntersectTheta = 1.0;
     final int expectedIntersectCount = 0;
@@ -137,8 +134,8 @@ public void EmptyDegenerate() {
 
   @Test
   public void emptyEstimation() {
-    IntegerSketch tupleA = getTupleSketch(SkType.EMPTY, 0, 0);
-    IntegerSketch tupleB = getTupleSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
+    IntegerTupleSketch tupleA = getTupleSketch(SkType.EMPTY, 0, 0);
+    IntegerTupleSketch tupleB = getTupleSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
     UpdatableThetaSketch thetaB =  getThetaSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
     final double expectedIntersectTheta = 1.0;
     final int expectedIntersectCount = 0;
@@ -160,8 +157,8 @@ public void emptyEstimation() {
 
   @Test
   public void exactEmpty() {
-    IntegerSketch tupleA = getTupleSketch(SkType.EXACT, 0, GT_MIDP_V);
-    IntegerSketch tupleB = getTupleSketch(SkType.EMPTY, 0, 0);
+    IntegerTupleSketch tupleA = getTupleSketch(SkType.EXACT, 0, GT_MIDP_V);
+    IntegerTupleSketch tupleB = getTupleSketch(SkType.EMPTY, 0, 0);
     UpdatableThetaSketch thetaB =  getThetaSketch(SkType.EMPTY, 0, 0);
     final double expectedIntersectTheta = 1.0;
     final int expectedIntersectCount = 0;
@@ -181,8 +178,8 @@ public void exactEmpty() {
 
   @Test
   public void exactExact() {
-    IntegerSketch tupleA = getTupleSketch(SkType.EXACT, 0, GT_MIDP_V);
-    IntegerSketch tupleB = getTupleSketch(SkType.EXACT, 0, GT_MIDP_V);
+    IntegerTupleSketch tupleA = getTupleSketch(SkType.EXACT, 0, GT_MIDP_V);
+    IntegerTupleSketch tupleB = getTupleSketch(SkType.EXACT, 0, GT_MIDP_V);
     UpdatableThetaSketch thetaB =  getThetaSketch(SkType.EXACT, 0, GT_MIDP_V);
     final double expectedIntersectTheta = 1.0;
     final int expectedIntersectCount = 1;
@@ -202,8 +199,8 @@ public void exactExact() {
 
   @Test
   public void exactDegenerate() {
-    IntegerSketch tupleA = getTupleSketch(SkType.EXACT, 0, LT_LOWP_V);
-    IntegerSketch tupleB = getTupleSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V); //entries = 0
+    IntegerTupleSketch tupleA = getTupleSketch(SkType.EXACT, 0, LT_LOWP_V);
+    IntegerTupleSketch tupleB = getTupleSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V); //entries = 0
     UpdatableThetaSketch thetaB =  getThetaSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
     final double expectedIntersectTheta = LOWP_FLT;
     final int expectedIntersectCount = 0;
@@ -223,8 +220,8 @@ public void exactDegenerate() {
 
   @Test
   public void exactEstimation() {
-    IntegerSketch tupleA = getTupleSketch(SkType.EXACT, 0, LT_LOWP_V);
-    IntegerSketch tupleB = getTupleSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
+    IntegerTupleSketch tupleA = getTupleSketch(SkType.EXACT, 0, LT_LOWP_V);
+    IntegerTupleSketch tupleB = getTupleSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
     UpdatableThetaSketch thetaB =  getThetaSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
     final double expectedIntersectTheta = LOWP_FLT;
     final int expectedIntersectCount = 1;
@@ -246,8 +243,8 @@ public void exactEstimation() {
 
   @Test
   public void estimationEmpty() {
-    IntegerSketch tupleA = getTupleSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
-    IntegerSketch tupleB = getTupleSketch(SkType.EMPTY, 0, 0);
+    IntegerTupleSketch tupleA = getTupleSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
+    IntegerTupleSketch tupleB = getTupleSketch(SkType.EMPTY, 0, 0);
     UpdatableThetaSketch thetaB =  getThetaSketch(SkType.EMPTY, 0, 0);
     final double expectedIntersectTheta = 1.0;
     final int expectedIntersectCount = 0;
@@ -267,8 +264,8 @@ public void estimationEmpty() {
 
   @Test
   public void estimationExact() {
-    IntegerSketch tupleA = getTupleSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
-    IntegerSketch tupleB = getTupleSketch(SkType.EXACT, 0, LT_LOWP_V);
+    IntegerTupleSketch tupleA = getTupleSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
+    IntegerTupleSketch tupleB = getTupleSketch(SkType.EXACT, 0, LT_LOWP_V);
     UpdatableThetaSketch thetaB =  getThetaSketch(SkType.EXACT, 0, LT_LOWP_V);
     final double expectedIntersectTheta = LOWP_FLT;
     final int expectedIntersectCount = 1;
@@ -288,8 +285,8 @@ public void estimationExact() {
 
   @Test
   public void estimationDegenerate() {
-    IntegerSketch tupleA = getTupleSketch(SkType.ESTIMATION, MIDP_FLT, LT_LOWP_V);
-    IntegerSketch tupleB = getTupleSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
+    IntegerTupleSketch tupleA = getTupleSketch(SkType.ESTIMATION, MIDP_FLT, LT_LOWP_V);
+    IntegerTupleSketch tupleB = getTupleSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
     UpdatableThetaSketch thetaB =  getThetaSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
     final double expectedIntersectTheta = LOWP_FLT;
     final int expectedIntersectCount = 0;
@@ -309,8 +306,8 @@ public void estimationDegenerate() {
 
   @Test
   public void estimationEstimation() {
-    IntegerSketch tupleA = getTupleSketch(SkType.ESTIMATION, MIDP_FLT, LT_LOWP_V);
-    IntegerSketch tupleB = getTupleSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
+    IntegerTupleSketch tupleA = getTupleSketch(SkType.ESTIMATION, MIDP_FLT, LT_LOWP_V);
+    IntegerTupleSketch tupleB = getTupleSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
     UpdatableThetaSketch thetaB =  getThetaSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
     final double expectedIntersectTheta = LOWP_FLT;
     final int expectedIntersectCount = 1;
@@ -332,8 +329,8 @@ public void estimationEstimation() {
 
   @Test
   public void degenerateEmpty() {
-    IntegerSketch tupleA = getTupleSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V); //entries = 0
-    IntegerSketch tupleB = getTupleSketch(SkType.EMPTY, 0, 0);
+    IntegerTupleSketch tupleA = getTupleSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V); //entries = 0
+    IntegerTupleSketch tupleB = getTupleSketch(SkType.EMPTY, 0, 0);
     UpdatableThetaSketch thetaB =  getThetaSketch(SkType.EMPTY, 0, 0);
     final double expectedIntersectTheta = 1.0;
     final int expectedIntersectCount = 0;
@@ -353,8 +350,8 @@ public void degenerateEmpty() {
 
   @Test
   public void degenerateExact() {
-    IntegerSketch tupleA = getTupleSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V); //entries = 0
-    IntegerSketch tupleB = getTupleSketch(SkType.EXACT, 0, LT_LOWP_V);
+    IntegerTupleSketch tupleA = getTupleSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V); //entries = 0
+    IntegerTupleSketch tupleB = getTupleSketch(SkType.EXACT, 0, LT_LOWP_V);
     UpdatableThetaSketch thetaB =  getThetaSketch(SkType.EXACT, 0, LT_LOWP_V);
     final double expectedIntersectTheta = LOWP_FLT;
     final int expectedIntersectCount = 0;
@@ -374,8 +371,8 @@ public void degenerateExact() {
 
   @Test
   public void degenerateDegenerate() {
-    IntegerSketch tupleA = getTupleSketch(SkType.DEGENERATE, MIDP_FLT, GT_MIDP_V); //entries = 0
-    IntegerSketch tupleB = getTupleSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
+    IntegerTupleSketch tupleA = getTupleSketch(SkType.DEGENERATE, MIDP_FLT, GT_MIDP_V); //entries = 0
+    IntegerTupleSketch tupleB = getTupleSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
     UpdatableThetaSketch thetaB =  getThetaSketch(SkType.DEGENERATE, LOWP_FLT, GT_LOWP_V);
     final double expectedIntersectTheta = LOWP_FLT;
     final int expectedIntersectCount = 0;
@@ -395,8 +392,8 @@ public void degenerateDegenerate() {
 
   @Test
   public void degenerateEstimation() {
-    IntegerSketch tupleA = getTupleSketch(SkType.DEGENERATE, MIDP_FLT, GT_MIDP_V); //entries = 0
-    IntegerSketch tupleB = getTupleSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
+    IntegerTupleSketch tupleA = getTupleSketch(SkType.DEGENERATE, MIDP_FLT, GT_MIDP_V); //entries = 0
+    IntegerTupleSketch tupleB = getTupleSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
     UpdatableThetaSketch thetaB =  getThetaSketch(SkType.ESTIMATION, LOWP_FLT, LT_LOWP_V);
     final double expectedIntersectTheta = LOWP_FLT;
     final int expectedIntersectCount = 0;
@@ -418,8 +415,8 @@ public void degenerateEstimation() {
   //=================================
 
   private void checks(
-      IntegerSketch tupleA,
-      IntegerSketch tupleB,
+      IntegerTupleSketch tupleA,
+      IntegerTupleSketch tupleB,
       UpdatableThetaSketch  thetaB,
       double expectedIntersectTheta,
       int expectedIntersectCount,
@@ -430,101 +427,101 @@ private void checks(
       double expectedUnionTheta,
       int expectedUnionCount,
       boolean expectedUnionEmpty) {
-    CompactSketch csk;
-    Intersection inter = new Intersection<>(setOperations);
-    AnotB anotb = new AnotB<>();
-    Union union = new Union<>(16, setOperations);
+    CompactTupleSketch csk;
+    TupleIntersection inter = new TupleIntersection<>(setOperations);
+    TupleAnotB anotb = new TupleAnotB<>();
+    TupleUnion union = new TupleUnion<>(16, setOperations);
 
-    //Intersection Stateless Tuple, Tuple Updatable
+    //TupleIntersection Stateless TupleSketch, TupleSketch Updatable
     csk = inter.intersect(tupleA, tupleB);
-    checkResult("Intersect Stateless Tuple, Tuple", csk, expectedIntersectTheta, expectedIntersectCount,
+    checkResult("Intersect Stateless TupleSketch, TupleSketch", csk, expectedIntersectTheta, expectedIntersectCount,
         expectedIntersectEmpty);
-    //Intersection Stateless Tuple, Tuple Compact
+    //TupleIntersection Stateless TupleSketch, TupleSketch Compact
     csk = inter.intersect(tupleA.compact(), tupleB.compact());
-    checkResult("Intersect Stateless Tuple, Tuple", csk, expectedIntersectTheta, expectedIntersectCount,
+    checkResult("Intersect Stateless TupleSketch, TupleSketch", csk, expectedIntersectTheta, expectedIntersectCount,
         expectedIntersectEmpty);
-    //Intersection Stateless Tuple, Theta Updatable
-    csk = inter.intersect(tupleA, thetaB, integerSummary); //Tuple, Theta
-    checkResult("Intersect Stateless Tuple, Theta", csk, expectedIntersectTheta, expectedIntersectCount,
+    //TupleIntersection Stateless TupleSketch, ThetaSketch Updatable
+    csk = inter.intersect(tupleA, thetaB, integerSummary); //TupleSketch, ThetaSketch
+    checkResult("Intersect Stateless TupleSketch, ThetaSketch", csk, expectedIntersectTheta, expectedIntersectCount,
         expectedIntersectEmpty);
-  //Intersection Stateless Tuple, Theta Compact
+  //TupleIntersection Stateless TupleSketch, ThetaSketch Compact
     csk = inter.intersect(tupleA.compact(), thetaB.compact(), integerSummary);
-    checkResult("Intersect Stateless Tuple, Theta", csk, expectedIntersectTheta, expectedIntersectCount,
+    checkResult("Intersect Stateless TupleSketch, ThetaSketch", csk, expectedIntersectTheta, expectedIntersectCount,
         expectedIntersectEmpty);
 
-    //AnotB Stateless Tuple, Tuple Updatable
-    csk = AnotB.aNotB(tupleA, tupleB);
-    checkResult("AnotB Stateless Tuple, Tuple", csk, expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
-    //AnotB Stateless Tuple, Tuple Compact
-    csk = AnotB.aNotB(tupleA.compact(), tupleB.compact());
-    checkResult("AnotB Stateless Tuple, Tuple", csk, expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
-    //AnotB Stateless Tuple, Theta Updatable
-    csk = AnotB.aNotB(tupleA, thetaB);
-    checkResult("AnotB Stateless Tuple, Theta", csk, expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
-    //AnotB Stateless Tuple, Theta Compact
-    csk = AnotB.aNotB(tupleA.compact(), thetaB.compact());
-    checkResult("AnotB Stateless Tuple, Theta", csk, expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
-
-    //AnotB Stateful Tuple, Tuple Updatable
+    //TupleAnotB Stateless TupleSketch, TupleSketch Updatable
+    csk = TupleAnotB.aNotB(tupleA, tupleB);
+    checkResult("TupleAnotB Stateless TupleSketch, TupleSketch", csk, expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
+    //TupleAnotB Stateless TupleSketch, TupleSketch Compact
+    csk = TupleAnotB.aNotB(tupleA.compact(), tupleB.compact());
+    checkResult("TupleAnotB Stateless TupleSketch, TupleSketch", csk, expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
+    //TupleAnotB Stateless TupleSketch, ThetaSketch Updatable
+    csk = TupleAnotB.aNotB(tupleA, thetaB);
+    checkResult("TupleAnotB Stateless TupleSketch, ThetaSketch", csk, expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
+    //TupleAnotB Stateless TupleSketch, ThetaSketch Compact
+    csk = TupleAnotB.aNotB(tupleA.compact(), thetaB.compact());
+    checkResult("TupleAnotB Stateless TupleSketch, ThetaSketch", csk, expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
+
+    //TupleAnotB Stateful TupleSketch, TupleSketch Updatable
     anotb.setA(tupleA);
     anotb.notB(tupleB);
     csk = anotb.getResult(true);
-    checkResult("AnotB Stateful Tuple, Tuple", csk,  expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
-    //AnotB Stateful Tuple, Tuple Compact
+    checkResult("TupleAnotB Stateful TupleSketch, TupleSketch", csk,  expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
+    //TupleAnotB Stateful TupleSketch, TupleSketch Compact
     anotb.setA(tupleA.compact());
     anotb.notB(tupleB.compact());
     csk = anotb.getResult(true);
-    checkResult("AnotB Stateful Tuple, Tuple", csk,  expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
-    //AnotB Stateful Tuple, Theta Updatable
+    checkResult("TupleAnotB Stateful TupleSketch, TupleSketch", csk,  expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
+    //TupleAnotB Stateful TupleSketch, ThetaSketch Updatable
     anotb.setA(tupleA);
     anotb.notB(thetaB);
     csk = anotb.getResult(true);
-    checkResult("AnotB Stateful Tuple, Theta", csk,  expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
-    //AnotB Stateful Tuple, Theta Compact
+    checkResult("TupleAnotB Stateful TupleSketch, ThetaSketch", csk,  expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
+    //TupleAnotB Stateful TupleSketch, ThetaSketch Compact
     anotb.setA(tupleA.compact());
     anotb.notB(thetaB.compact());
     csk = anotb.getResult(true);
-    checkResult("AnotB Stateful Tuple, Theta", csk,  expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
+    checkResult("TupleAnotB Stateful TupleSketch, ThetaSketch", csk,  expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
 
-    //Union Stateless Tuple, Tuple Updatable
+    //TupleUnion Stateless TupleSketch, TupleSketch Updatable
     csk = union.union(tupleA, tupleB);
-    checkResult("Union Stateless Tuple, Tuple", csk, expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
-    //Union Stateless Tuple, Tuple Compact
+    checkResult("TupleUnion Stateless TupleSketch, TupleSketch", csk, expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
+    //TupleUnion Stateless TupleSketch, TupleSketch Compact
     csk = union.union(tupleA.compact(), tupleB.compact());
-    checkResult("Union Stateless Tuple, Tuple", csk, expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
-    //Union Stateless Tuple, Theta Updatable
+    checkResult("TupleUnion Stateless TupleSketch, TupleSketch", csk, expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
+    //TupleUnion Stateless TupleSketch, ThetaSketch Updatable
     csk = union.union(tupleA, thetaB, integerSummary);
-    checkResult("Union Stateless Tuple, Theta", csk, expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
-    //Union Stateless Tuple, Theta Compact
+    checkResult("TupleUnion Stateless TupleSketch, ThetaSketch", csk, expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
+    //TupleUnion Stateless TupleSketch, ThetaSketch Compact
     csk = union.union(tupleA.compact(), thetaB.compact(), integerSummary);
-    checkResult("Union Stateless Tuple, Theta", csk, expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
+    checkResult("TupleUnion Stateless TupleSketch, ThetaSketch", csk, expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
 
-    //Union Stateful Tuple, Tuple Updatable
+    //TupleUnion Stateful TupleSketch, TupleSketch Updatable
     union.union(tupleA);
     union.union(tupleB);
     csk = union.getResult(true);
-    checkResult("Union Stateful Tuple, Tuple", csk,  expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
-    //AnotB Stateful Tuple, Tuple Compact
+    checkResult("TupleUnion Stateful TupleSketch, TupleSketch", csk,  expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
+    //TupleAnotB Stateful TupleSketch, TupleSketch Compact
     union.union(tupleA.compact());
     union.union(tupleB.compact());
     csk = union.getResult(true);
-    checkResult("Union Stateful Tuple, Tuple", csk,  expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
-    //AnotB Stateful Tuple, Theta Updatable
+    checkResult("TupleUnion Stateful TupleSketch, TupleSketch", csk,  expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
+    //TupleAnotB Stateful TupleSketch, ThetaSketch Updatable
     union.union(tupleA);
     union.union(thetaB, integerSummary);
     csk = union.getResult(true);
-    checkResult("Union Stateful Tuple, Theta", csk,  expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
-    //AnotB Stateful Tuple, Theta Compact
+    checkResult("TupleUnion Stateful TupleSketch, ThetaSketch", csk,  expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
+    //TupleAnotB Stateful TupleSketch, ThetaSketch Compact
     union.union(tupleA.compact());
     union.union(thetaB.compact(), integerSummary);
     csk = union.getResult(true);
-    checkResult("Union Stateful Tuple, Theta", csk,  expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
+    checkResult("TupleUnion Stateful TupleSketch, ThetaSketch", csk,  expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
 
   }
 
   private static void checkResult(
       String comment,
-      CompactSketch csk,
+      CompactTupleSketch csk,
       double expectedTheta,
       int expectedEntries,
       boolean expectedEmpty) {
@@ -545,31 +542,31 @@ private static void checkResult(
     }
   }
 
-  private static IntegerSketch getTupleSketch(
+  private static IntegerTupleSketch getTupleSketch(
       SkType skType,
       float p,
       long updateKey) {
 
-    IntegerSketch sk;
+    IntegerTupleSketch sk;
     switch(skType) {
       case EMPTY: { // { 1.0,  0, T} p and value are not used
-        sk = new IntegerSketch(4, 2, 1.0f, IntegerSummary.Mode.Min);
+        sk = new IntegerTupleSketch(4, 2, 1.0f, IntegerSummary.Mode.Min);
         break;
       }
       case EXACT: { // { 1.0, >0, F} p is not used
-        sk = new IntegerSketch(4, 2, 1.0f, IntegerSummary.Mode.Min);
+        sk = new IntegerTupleSketch(4, 2, 1.0f, IntegerSummary.Mode.Min);
         sk.update(updateKey, 1);
         break;
       }
       case ESTIMATION: { // {<1.0, >0, F}
         checkValidUpdate(p, updateKey);
-        sk = new IntegerSketch(4, 2, p, IntegerSummary.Mode.Min);
+        sk = new IntegerTupleSketch(4, 2, p, IntegerSummary.Mode.Min);
         sk.update(updateKey, 1);
         break;
       }
       case DEGENERATE: { // {<1.0,  0, F}
         checkInvalidUpdate(p, updateKey);
-        sk = new IntegerSketch(4, 2, p, IntegerSummary.Mode.Min);
+        sk = new IntegerTupleSketch(4, 2, p, IntegerSummary.Mode.Min);
         sk.update(updateKey, 1); // > theta
         break;
       }
@@ -584,7 +581,7 @@ private static UpdatableThetaSketch getThetaSketch(
       SkType skType,
       float p,
       long updateKey) {
-    UpdateSketchBuilder bldr = new UpdateSketchBuilder();
+    UpdatableThetaSketchBuilder bldr = new UpdatableThetaSketchBuilder();
     bldr.setLogNominalEntries(4);
     bldr.setResizeFactor(ResizeFactor.X4);
 
diff --git a/src/test/java/org/apache/datasketches/tuple/aninteger/EngagementTest.java b/src/test/java/org/apache/datasketches/tuple/aninteger/EngagementTest.java
index c467fb7af..cd2a20ea9 100644
--- a/src/test/java/org/apache/datasketches/tuple/aninteger/EngagementTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/aninteger/EngagementTest.java
@@ -25,10 +25,10 @@
 import static org.apache.datasketches.tuple.aninteger.IntegerSummary.Mode.AlwaysOne;
 import static org.apache.datasketches.tuple.aninteger.IntegerSummary.Mode.Sum;
 
-import org.apache.datasketches.tuple.CompactSketch;
+import org.apache.datasketches.tuple.CompactTupleSketch;
 import org.apache.datasketches.tuple.TupleSketchIterator;
-import org.apache.datasketches.tuple.Union;
-import org.apache.datasketches.tuple.aninteger.IntegerSketch;
+import org.apache.datasketches.tuple.TupleUnion;
+import org.apache.datasketches.tuple.aninteger.IntegerTupleSketch;
 import org.apache.datasketches.tuple.aninteger.IntegerSummary;
 import org.apache.datasketches.tuple.aninteger.IntegerSummarySetOperations;
 import org.testng.annotations.Test;
@@ -45,9 +45,9 @@ public void computeEngagementHistogram() {
     final int K = 1 << lgK;
     final int days = 30;
     int v = 0;
-    final IntegerSketch[] skArr = new IntegerSketch[days];
+    final IntegerTupleSketch[] skArr = new IntegerTupleSketch[days];
     for (int i = 0; i < days; i++) {
-      skArr[i] = new IntegerSketch(lgK, AlwaysOne);
+      skArr[i] = new IntegerTupleSketch(lgK, AlwaysOne);
     }
     for (int i = 0; i <= days; i++) { //31 generating indices for symmetry
       final int numIds = numIDs(days, i);
@@ -75,15 +75,15 @@ private static int numDays(final int totalDays, final int index) {
     return (int)round(exp((d - i) * log(d) / d));
   }
 
-  private static void unionOps(final int K, final IntegerSummary.Mode mode, final IntegerSketch ... sketches) {
+  private static void unionOps(final int K, final IntegerSummary.Mode mode, final IntegerTupleSketch ... sketches) {
     final IntegerSummarySetOperations setOps = new IntegerSummarySetOperations(mode, mode);
-    final Union union = new Union<>(K, setOps);
+    final TupleUnion union = new TupleUnion<>(K, setOps);
     final int len = sketches.length;
 
-    for (final IntegerSketch isk : sketches) {
+    for (final IntegerTupleSketch isk : sketches) {
       union.union(isk);
     }
-    final CompactSketch result = union.getResult();
+    final CompactTupleSketch result = union.getResult();
     final TupleSketchIterator itr = result.iterator();
 
     final int[] numDaysArr = new int[len + 1]; //zero index is ignored
diff --git a/src/test/java/org/apache/datasketches/tuple/aninteger/IntegerSketchTest.java b/src/test/java/org/apache/datasketches/tuple/aninteger/IntegerSketchTest.java
index 951129425..8111eb544 100644
--- a/src/test/java/org/apache/datasketches/tuple/aninteger/IntegerSketchTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/aninteger/IntegerSketchTest.java
@@ -23,12 +23,9 @@
 
 import java.lang.foreign.MemorySegment;
 
-import org.apache.datasketches.tuple.AnotB;
-import org.apache.datasketches.tuple.CompactSketch;
-import org.apache.datasketches.tuple.Intersection;
-import org.apache.datasketches.tuple.aninteger.IntegerSketch;
-import org.apache.datasketches.tuple.aninteger.IntegerSummary;
-import org.apache.datasketches.tuple.aninteger.IntegerSummarySetOperations;
+import org.apache.datasketches.tuple.TupleAnotB;
+import org.apache.datasketches.tuple.CompactTupleSketch;
+import org.apache.datasketches.tuple.TupleIntersection;
 import org.testng.annotations.Test;
 
 /**
@@ -42,14 +39,14 @@ public void serDeTest() {
     final int lgK = 12;
     final int K = 1 << lgK;
     final IntegerSummary.Mode a1Mode = IntegerSummary.Mode.AlwaysOne;
-    final IntegerSketch a1Sk = new IntegerSketch(lgK, a1Mode);
+    final IntegerTupleSketch a1Sk = new IntegerTupleSketch(lgK, a1Mode);
     final int m = 2 * K;
     for (int i = 0; i < m; i++) {
       a1Sk.update(i, 1);
     }
     final double est1 = a1Sk.getEstimate();
     final MemorySegment seg = MemorySegment.ofArray(a1Sk.toByteArray());
-    final IntegerSketch a1Sk2 = new IntegerSketch(seg, a1Mode);
+    final IntegerTupleSketch a1Sk2 = new IntegerTupleSketch(seg, a1Mode);
     final double est2 = a1Sk2.getEstimate();
     assertEquals(est1, est2);
   }
@@ -59,18 +56,18 @@ public void intersectTest() {
     final int lgK = 12;
     final int K = 1 << lgK;
     final IntegerSummary.Mode a1Mode = IntegerSummary.Mode.AlwaysOne;
-    final IntegerSketch a1Sk1 = new IntegerSketch(lgK, a1Mode);
-    final IntegerSketch a1Sk2 = new IntegerSketch(lgK, a1Mode);
+    final IntegerTupleSketch a1Sk1 = new IntegerTupleSketch(lgK, a1Mode);
+    final IntegerTupleSketch a1Sk2 = new IntegerTupleSketch(lgK, a1Mode);
     final int m = 2 * K;
     for (int i = 0; i < m; i++) {
       a1Sk1.update(i, 1);
       a1Sk2.update(i + m/2, 1);
     }
-    final Intersection inter =
-        new Intersection<>(new IntegerSummarySetOperations(a1Mode, a1Mode));
+    final TupleIntersection inter =
+        new TupleIntersection<>(new IntegerSummarySetOperations(a1Mode, a1Mode));
     inter.intersect(a1Sk1);
     inter.intersect(a1Sk2);
-    final CompactSketch csk = inter.getResult();
+    final CompactTupleSketch csk = inter.getResult();
     assertEquals(csk.getEstimate(), K * 1.0, K * .03);
   }
 
@@ -79,15 +76,15 @@ public void aNotBTest() {
     final int lgK = 4;
     final int u = 5;
     final IntegerSummary.Mode a1Mode = IntegerSummary.Mode.AlwaysOne;
-    final IntegerSketch a1Sk1 = new IntegerSketch(lgK, a1Mode);
-    final IntegerSketch a1Sk2 = null;//new IntegerSketch(lgK, a1Mode);
-    final AnotB anotb = new AnotB<>();
+    final IntegerTupleSketch a1Sk1 = new IntegerTupleSketch(lgK, a1Mode);
+    final IntegerTupleSketch a1Sk2 = null;//new IntegerTupleSketch(lgK, a1Mode);
+    final TupleAnotB anotb = new TupleAnotB<>();
     for (int i = 0; i < u; i++) {
       a1Sk1.update(i, 1);
     }
     anotb.setA(a1Sk1);
     anotb.notB(a1Sk2);
-    final CompactSketch cSk = anotb.getResult(true);
+    final CompactTupleSketch cSk = anotb.getResult(true);
     assertEquals((int)cSk.getEstimate(), u);
   }
 
@@ -97,8 +94,8 @@ public void checkMinMaxMode() {
     final int K = 1 << lgK;
     final IntegerSummary.Mode minMode = IntegerSummary.Mode.Min;
     final IntegerSummary.Mode maxMode = IntegerSummary.Mode.Max;
-    final IntegerSketch a1Sk1 = new IntegerSketch(lgK, minMode);
-    final IntegerSketch a1Sk2 = new IntegerSketch(lgK, maxMode);
+    final IntegerTupleSketch a1Sk1 = new IntegerTupleSketch(lgK, minMode);
+    final IntegerTupleSketch a1Sk2 = new IntegerTupleSketch(lgK, maxMode);
     final int m = K / 2;
     for (int key = 0; key < m; key++) {
       a1Sk1.update(key, 1);
@@ -118,7 +115,7 @@ public void checkStringKey() {
     final int lgK = 12;
     final int K = 1 << lgK;
     final IntegerSummary.Mode a1Mode = IntegerSummary.Mode.AlwaysOne;
-    final IntegerSketch a1Sk1 = new IntegerSketch(lgK, a1Mode);
+    final IntegerTupleSketch a1Sk1 = new IntegerTupleSketch(lgK, a1Mode);
     final int m = K / 2;
     for (int key = 0; key < m; key++) {
       a1Sk1.update(Integer.toHexString(key), 1);
diff --git a/src/test/java/org/apache/datasketches/tuple/aninteger/MikhailsBugTupleTest.java b/src/test/java/org/apache/datasketches/tuple/aninteger/MikhailsBugTupleTest.java
index 0809e972d..5e08748a2 100644
--- a/src/test/java/org/apache/datasketches/tuple/aninteger/MikhailsBugTupleTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/aninteger/MikhailsBugTupleTest.java
@@ -19,38 +19,35 @@
 
 package org.apache.datasketches.tuple.aninteger;
 
-import org.apache.datasketches.tuple.AnotB;
-import org.apache.datasketches.tuple.CompactSketch;
-import org.apache.datasketches.tuple.Intersection;
-import org.apache.datasketches.tuple.aninteger.IntegerSketch;
-import org.apache.datasketches.tuple.aninteger.IntegerSummary;
-import org.apache.datasketches.tuple.aninteger.IntegerSummarySetOperations;
+import org.apache.datasketches.tuple.CompactTupleSketch;
+import org.apache.datasketches.tuple.TupleIntersection;
+import org.apache.datasketches.tuple.TupleAnotB;
 import org.testng.annotations.Test;
 
 /**
  * Issue #368, from Mikhail Lavrinovich 12 OCT 2021
- * The failure was AnotB(estimating {<1.0,1,F}, Intersect(estimating{<1.0,1,F}, newDegenerative{<1.0,0,T},
- * Which should be equal to AnotB(estimating{<1.0,1,F}, new{1.0,0,T} = estimating{<1.0, 1, F}. The AnotB
- * threw a null pointer exception because it was not properly handling sketches with zero entries.
+ * The failure was TupleAnotB(estimating {<1.0,1,F}, TupleIntersect(estimating{<1.0,1,F}, newDegenerative{<1.0,0,T},
+ * Which should be equal to TupleAnotB(estimating{<1.0,1,F}, new{1.0,0,T} = estimating{<1.0, 1, F}.
+ * The TupleAnotB threw a null pointer exception because it was not properly handling sketches with zero entries.
  */
 public class MikhailsBugTupleTest {
 
   @Test
   public void mikhailsBug() {
-    IntegerSketch x = new IntegerSketch(12, 2, 0.1f, IntegerSummary.Mode.Min);
-    IntegerSketch y = new IntegerSketch(12, 2, 0.1f, IntegerSummary.Mode.Min);
+    IntegerTupleSketch x = new IntegerTupleSketch(12, 2, 0.1f, IntegerSummary.Mode.Min);
+    IntegerTupleSketch y = new IntegerTupleSketch(12, 2, 0.1f, IntegerSummary.Mode.Min);
     x.update(1L, 1);
     IntegerSummarySetOperations setOperations =
         new IntegerSummarySetOperations(IntegerSummary.Mode.Min, IntegerSummary.Mode.Min);
-    Intersection intersection = new Intersection<>(setOperations);
-    CompactSketch intersect = intersection.intersect(x, y);
-    AnotB.aNotB(x, intersect); // NPE was here
+    TupleIntersection intersection = new TupleIntersection<>(setOperations);
+    CompactTupleSketch intersect = intersection.intersect(x, y);
+    TupleAnotB.aNotB(x, intersect); // NPE was here
   }
 
   //@Test
   public void withTuple() {
-    IntegerSketch x = new IntegerSketch(12, 2, 0.1f, IntegerSummary.Mode.Min);
-    IntegerSketch y = new IntegerSketch(12, 2, 0.1f, IntegerSummary.Mode.Min);
+    IntegerTupleSketch x = new IntegerTupleSketch(12, 2, 0.1f, IntegerSummary.Mode.Min);
+    IntegerTupleSketch y = new IntegerTupleSketch(12, 2, 0.1f, IntegerSummary.Mode.Min);
     x.update(1L, 1);
     println("Tuple x: Estimating {<1.0,1,F}");
     println(x.toString());
@@ -58,12 +55,12 @@ public void withTuple() {
     println(y.toString());
     IntegerSummarySetOperations setOperations =
         new IntegerSummarySetOperations(IntegerSummary.Mode.Min, IntegerSummary.Mode.Min);
-    Intersection intersection = new Intersection<>(setOperations);
-    CompactSketch intersect = intersection.intersect(x, y);
-    println("Tuple Intersect(Estimating, NewDegen) = new {1.0, 0, T}");
+    TupleIntersection intersection = new TupleIntersection<>(setOperations);
+    CompactTupleSketch intersect = intersection.intersect(x, y);
+    println("TupleIntersect(Estimating, NewDegen) = new {1.0, 0, T}");
     println(intersect.toString());
-    CompactSketch csk = AnotB.aNotB(x, intersect);
-    println("Tuple AnotB(Estimating, New) = estimating {<1.0, 1, F}");
+    CompactTupleSketch csk = TupleAnotB.aNotB(x, intersect);
+    println("TupleAnotB(Estimating, New) = estimating {<1.0, 1, F}");
     println(csk.toString());
   }
 
diff --git a/src/test/java/org/apache/datasketches/tuple/aninteger/ParameterLeakageTest.java b/src/test/java/org/apache/datasketches/tuple/aninteger/ParameterLeakageTest.java
index 51eee988b..988d188dd 100644
--- a/src/test/java/org/apache/datasketches/tuple/aninteger/ParameterLeakageTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/aninteger/ParameterLeakageTest.java
@@ -22,15 +22,12 @@
 import static org.apache.datasketches.tuple.aninteger.IntegerSummary.Mode.Min;
 import static org.apache.datasketches.tuple.aninteger.IntegerSummary.Mode.Sum;
 
-import org.apache.datasketches.tuple.AnotB;
-import org.apache.datasketches.tuple.CompactSketch;
-import org.apache.datasketches.tuple.Intersection;
-import org.apache.datasketches.tuple.Sketch;
+import org.apache.datasketches.tuple.CompactTupleSketch;
+import org.apache.datasketches.tuple.TupleIntersection;
+import org.apache.datasketches.tuple.TupleAnotB;
+import org.apache.datasketches.tuple.TupleSketch;
 import org.apache.datasketches.tuple.TupleSketchIterator;
-import org.apache.datasketches.tuple.Union;
-import org.apache.datasketches.tuple.aninteger.IntegerSketch;
-import org.apache.datasketches.tuple.aninteger.IntegerSummary;
-import org.apache.datasketches.tuple.aninteger.IntegerSummarySetOperations;
+import org.apache.datasketches.tuple.TupleUnion;
 import org.testng.annotations.Test;
 
 /**
@@ -45,20 +42,20 @@ public class ParameterLeakageTest {
 
   @Test
   public void checkUnion() {
-    IntegerSketch sk1 = new IntegerSketch(4, Sum);
+    IntegerTupleSketch sk1 = new IntegerTupleSketch(4, Sum);
     sk1.update(1, 1);
     IntegerSummary sk1sum = captureSummaries(sk1)[0];
 
-    IntegerSketch sk2 = new IntegerSketch(4, Sum);
+    IntegerTupleSketch sk2 = new IntegerTupleSketch(4, Sum);
     sk2.update(2, 1);
     IntegerSummary sk2sum = captureSummaries(sk2)[0];
 
 
-    Union union = new Union<>(setOps);
+    TupleUnion union = new TupleUnion<>(setOps);
 
-    CompactSketch csk = union.union(sk1, sk2);
+    CompactTupleSketch csk = union.union(sk1, sk2);
     IntegerSummary[] summaries = captureSummaries(csk);
-    println("Union Count: " + summaries.length);
+    println("TupleUnion Count: " + summaries.length);
 
     for (IntegerSummary isum : summaries) {
       if ((isum == sk1sum) || (isum == sk2sum)) {
@@ -69,17 +66,17 @@ public void checkUnion() {
 
   @Test
   public void checkIntersectStateless() {
-    IntegerSketch sk1 = new IntegerSketch(4, Sum);
+    IntegerTupleSketch sk1 = new IntegerTupleSketch(4, Sum);
     sk1.update(1, 1);
     IntegerSummary sk1sum = captureSummaries(sk1)[0];
 
-    IntegerSketch sk2 = new IntegerSketch(4, Sum);
+    IntegerTupleSketch sk2 = new IntegerTupleSketch(4, Sum);
     sk2.update(1, 1);
     IntegerSummary sk2sum = captureSummaries(sk2)[0];
 
-    Intersection intersect = new Intersection<>(setOps);
+    TupleIntersection intersect = new TupleIntersection<>(setOps);
 
-    CompactSketch csk = intersect.intersect(sk1, sk2);
+    CompactTupleSketch csk = intersect.intersect(sk1, sk2);
     IntegerSummary[] summaries = captureSummaries(csk);
     println("Intersect Stateless Count: " + summaries.length);
 
@@ -92,19 +89,19 @@ public void checkIntersectStateless() {
 
   @Test
   public void checkIntersectStateful() {
-    IntegerSketch sk1 = new IntegerSketch(4, Sum);
+    IntegerTupleSketch sk1 = new IntegerTupleSketch(4, Sum);
     sk1.update(1, 1);
     IntegerSummary sk1sum = captureSummaries(sk1)[0];
 
-    IntegerSketch sk2 = new IntegerSketch(4, Sum);
+    IntegerTupleSketch sk2 = new IntegerTupleSketch(4, Sum);
     sk2.update(1, 1);
     IntegerSummary sk2sum = captureSummaries(sk2)[0];
 
-    Intersection intersect = new Intersection<>(setOps);
+    TupleIntersection intersect = new TupleIntersection<>(setOps);
 
     intersect.intersect(sk1);
     intersect.intersect(sk2);
-    CompactSketch csk = intersect.getResult();
+    CompactTupleSketch csk = intersect.getResult();
 
     IntegerSummary[] summaries = captureSummaries(csk);
     println("Intersect Stateful Count: " + summaries.length);
@@ -118,16 +115,16 @@ public void checkIntersectStateful() {
 
   @Test
   public void checkAnotbStateless() {
-    IntegerSketch sk1 = new IntegerSketch(4, Sum);
+    IntegerTupleSketch sk1 = new IntegerTupleSketch(4, Sum);
     sk1.update(1, 1);
-    CompactSketch csk1 = sk1.compact();
+    CompactTupleSketch csk1 = sk1.compact();
     IntegerSummary sk1sum = captureSummaries(csk1)[0];
 
-    IntegerSketch sk2 = new IntegerSketch(4, Sum); //EMPTY
+    IntegerTupleSketch sk2 = new IntegerTupleSketch(4, Sum); //EMPTY
 
-    CompactSketch csk = AnotB.aNotB(csk1, sk2);
+    CompactTupleSketch csk = TupleAnotB.aNotB(csk1, sk2);
     IntegerSummary[] summaries = captureSummaries(csk);
-    println("AnotB Stateless Count: " + summaries.length);
+    println("TupleAnotB Stateless Count: " + summaries.length);
 
     for (IntegerSummary isum : summaries) {
       if (isum == sk1sum) {
@@ -138,21 +135,21 @@ public void checkAnotbStateless() {
 
   @Test
   public void checkAnotbStateful() {
-    IntegerSketch sk1 = new IntegerSketch(4, Sum);
+    IntegerTupleSketch sk1 = new IntegerTupleSketch(4, Sum);
     sk1.update(1, 1);
-    CompactSketch csk1 = sk1.compact();
+    CompactTupleSketch csk1 = sk1.compact();
     IntegerSummary sk1sum = captureSummaries(csk1)[0];
 
-    IntegerSketch sk2 = new IntegerSketch(4, Sum); //EMPTY
+    IntegerTupleSketch sk2 = new IntegerTupleSketch(4, Sum); //EMPTY
 
-    AnotB anotb = new AnotB<>();
+    TupleAnotB anotb = new TupleAnotB<>();
 
     anotb.setA(csk1);
     anotb.notB(sk2);
 
-    CompactSketch csk = anotb.getResult(true);
+    CompactTupleSketch csk = anotb.getResult(true);
     IntegerSummary[] summaries = captureSummaries(csk);
-    println("AnotB Stateful Count: " + summaries.length);
+    println("TupleAnotB Stateful Count: " + summaries.length);
 
     for (IntegerSummary isum : summaries) {
       if (isum == sk1sum) {
@@ -161,7 +158,7 @@ public void checkAnotbStateful() {
     }
   }
 
-  private static IntegerSummary[] captureSummaries(Sketch sk) {
+  private static IntegerSummary[] captureSummaries(TupleSketch sk) {
     int entries = sk.getRetainedEntries();
     IntegerSummary[] intSumArr = new IntegerSummary[entries];
     int cnt = 0;
diff --git a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUnionTest.java b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUnionTest.java
index ea507b89c..3ba169673 100644
--- a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUnionTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUnionTest.java
@@ -27,7 +27,6 @@
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSetOperationBuilder;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketch;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketchIterator;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketches;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUnion;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketch;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketchBuilder;
@@ -66,7 +65,7 @@ public void heapExactMode() {
     Assert.assertEquals(values[2][0], 3.0);
 
     final MemorySegment wseg = MemorySegment.ofArray(union.toByteArray());
-    final ArrayOfDoublesUnion wrappedUnion = ArrayOfDoublesSketches.wrapUnion(wseg);
+    final ArrayOfDoublesUnion wrappedUnion = ArrayOfDoublesSketch.wrapUnion(wseg);
     result = wrappedUnion.getResult();
     Assert.assertEquals(result.getEstimate(), 3.0);
     values = result.getValues();
@@ -468,7 +467,7 @@ public void directDruidUsageOneSketch() {
     // as Druid wraps MemorySegment
     MemorySegment seg2 = MemorySegment.ofArray(new byte[1_000_000]);
     ArrayOfDoublesCompactSketch dcsk = sketch.compact(seg2);
-    ArrayOfDoublesUnion union = ArrayOfDoublesSketches.wrapUnion(seg); //empty union
+    ArrayOfDoublesUnion union = ArrayOfDoublesSketch.wrapUnion(seg); //empty union
     union.union(dcsk);
     //ArrayOfDoublesSketches.wrapUnion(seg).union(sketch.compact(MemorySegment.ofArray(new byte[1_000_000])));
 
@@ -490,7 +489,7 @@ public void directDruidUsageTwoSketches() {
       sketch1.update(key++, new double[] {1.0});
     }
     // as Druid wraps MemorySegment
-    ArrayOfDoublesSketches.wrapUnion(seg).union(sketch1.compact(MemorySegment.ofArray(new byte[1000000])));
+    ArrayOfDoublesSketch.wrapUnion(seg).union(sketch1.compact(MemorySegment.ofArray(new byte[1000000])));
 
     final int n2 = 1000000; // estimation mode
     final ArrayOfDoublesUpdatableSketch sketch2 = new ArrayOfDoublesUpdatableSketchBuilder().build();
@@ -498,7 +497,7 @@ public void directDruidUsageTwoSketches() {
       sketch2.update(key++, new double[] {1.0});
     }
     // as Druid wraps MemorySegment
-    ArrayOfDoublesSketches.wrapUnion(seg).union(sketch2.compact(MemorySegment.ofArray(new byte[1000000])));
+    ArrayOfDoublesSketch.wrapUnion(seg).union(sketch2.compact(MemorySegment.ofArray(new byte[1000000])));
 
     // build one sketch that must be the same as union
     key = 0; // reset to have the same keys
diff --git a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/CornerCaseArrayOfDoublesSetOperationsTest.java b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/CornerCaseArrayOfDoublesSetOperationsTest.java
index f1ede92e6..02c56fd96 100644
--- a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/CornerCaseArrayOfDoublesSetOperationsTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/CornerCaseArrayOfDoublesSetOperationsTest.java
@@ -24,20 +24,12 @@
 import static org.testng.Assert.assertTrue;
 
 import org.apache.datasketches.common.Util;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesAnotB;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesCombiner;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesCompactSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesIntersection;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSetOperationBuilder;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUnion;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketchBuilder;
 import org.testng.annotations.Test;
 
 public class CornerCaseArrayOfDoublesSetOperationsTest {
-  //Stateful Intersection with intersect(sketch A, combiner), followed by getResult()
-  //Essentially Stateless AnotB with update(Sketch A, Sketch B), followed by getResult()
-  //Stateful Union with union(Sketch A), followed by getResult()
+  //Stateful TupleIntersection with intersect(sketch A, combiner), followed by getResult()
+  //Essentially Stateless TupleAnotB with update(TupleSketch A, TupleSketch B), followed by getResult()
+  //Stateful TupleUnion with union(TupleSketch A), followed by getResult()
 
   /* Hashes and Hash Equivalents
    *               Top8bits  Hex               Decimal
@@ -433,14 +425,14 @@ private static void checks(
     ArrayOfDoublesAnotB anotb = new ArrayOfDoublesSetOperationBuilder().buildAnotB();
     ArrayOfDoublesUnion union = new ArrayOfDoublesSetOperationBuilder().buildUnion();
 
-    //Intersection Tuple, Tuple Updatable Stateful
+    //TupleIntersection Tuple, Tuple Updatable Stateful
     inter.intersect(tupleA, minCombiner);
     inter.intersect(tupleB, minCombiner);
     csk = inter.getResult();
     inter.reset();
     checkResult("Intersect Stateless Theta, Theta", csk, expectedIntersectTheta, expectedIntersectCount,
         expectedIntersectEmpty);
-    //Intersection Tuple, Tuple Compact Stateful
+    //TupleIntersection Tuple, Tuple Compact Stateful
     inter.intersect(tupleA.compact(), minCombiner);
     inter.intersect(tupleB.compact(), minCombiner);
     csk = inter.getResult();
@@ -448,27 +440,27 @@ private static void checks(
     checkResult("Intersect Stateless Theta, Theta", csk, expectedIntersectTheta, expectedIntersectCount,
         expectedIntersectEmpty);
 
-    //AnotB Stateless Tuple, Tuple Updatable
+    //TupleAnotB Stateless Tuple, Tuple Updatable
     anotb.update(tupleA, tupleB);
     csk = anotb.getResult();
-    checkResult("AnotB Stateless Theta, Theta", csk, expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
-    //AnotB Stateless Tuple, Tuple Compact
+    checkResult("TupleAnotB Stateless Theta, Theta", csk, expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
+    //TupleAnotB Stateless Tuple, Tuple Compact
     anotb.update(tupleA, tupleB);
     csk = anotb.getResult();
-    checkResult("AnotB Stateless Theta, Theta", csk, expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
+    checkResult("TupleAnotB Stateless Theta, Theta", csk, expectedAnotbTheta, expectedAnotbCount, expectedAnotbEmpty);
 
-    //Union Stateful Tuple, Tuple Updatable
+    //TupleUnion Stateful Tuple, Tuple Updatable
     union.union(tupleA);
     union.union(tupleB);
     csk = union.getResult();
     union.reset();
-    checkResult("Union Stateless Theta, Theta", csk, expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
-    //Union Stateful Tuple, Tuple Compact
+    checkResult("TupleUnion Stateless Theta, Theta", csk, expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
+    //TupleUnion Stateful Tuple, Tuple Compact
     union.union(tupleA.compact());
     union.union(tupleB.compact());
     csk = union.getResult();
     union.reset();
-    checkResult("Union Stateless Theta, Theta", csk, expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
+    checkResult("TupleUnion Stateless Theta, Theta", csk, expectedUnionTheta, expectedUnionCount, expectedUnionEmpty);
   }
 
   private static void checkResult(
diff --git a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesCompactSketchTest.java b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesCompactSketchTest.java
index 4cf9693ca..229e44e52 100644
--- a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesCompactSketchTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesCompactSketchTest.java
@@ -26,7 +26,6 @@
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesCompactSketch;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketch;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketchIterator;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketches;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketch;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketchBuilder;
 import org.testng.Assert;
@@ -89,7 +88,7 @@ public void serializeDeserializeSmallExact() {
     us.update("b", new double[] {1.0});
     us.update("c", new double[] {1.0});
     ArrayOfDoublesCompactSketch sketch1 = us.compact(MemorySegment.ofArray(new byte[1000000]));
-    ArrayOfDoublesSketch sketch2 = ArrayOfDoublesSketches.wrapSketch(MemorySegment.ofArray(sketch1.toByteArray()));
+    ArrayOfDoublesSketch sketch2 = ArrayOfDoublesSketch.wrapSketch(MemorySegment.ofArray(sketch1.toByteArray()));
     Assert.assertFalse(sketch2.isEmpty());
     Assert.assertFalse(sketch2.isEstimationMode());
     Assert.assertEquals(sketch2.getEstimate(), 3.0);
@@ -112,7 +111,7 @@ public void serializeDeserializeEstimation() {
       us.update(i, new double[] {1.0});
     }
     ArrayOfDoublesCompactSketch sketch1 = us.compact(MemorySegment.ofArray(new byte[1000000]));
-    ArrayOfDoublesSketch sketch2 = ArrayOfDoublesSketches.wrapSketch(MemorySegment.ofArray(sketch1.toByteArray()));
+    ArrayOfDoublesSketch sketch2 = ArrayOfDoublesSketch.wrapSketch(MemorySegment.ofArray(sketch1.toByteArray()));
     Assert.assertFalse(sketch2.isEmpty());
     Assert.assertTrue(sketch2.isEstimationMode());
     Assert.assertEquals(sketch2.getEstimate(), sketch1.getEstimate());
@@ -126,7 +125,7 @@ public void deserializeWithWrongSeed() {
       us.update(i, new double[] {1.0});
     }
     ArrayOfDoublesCompactSketch sketch1 = us.compact(MemorySegment.ofArray(new byte[1000000]));
-    ArrayOfDoublesSketches.wrapSketch(MemorySegment.ofArray(sketch1.toByteArray()), 123);
+    ArrayOfDoublesSketch.wrapSketch(MemorySegment.ofArray(sketch1.toByteArray()), 123);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
diff --git a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesCompactSketchTest.java b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesCompactSketchTest.java
index 0583c139f..69228c515 100644
--- a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesCompactSketchTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesCompactSketchTest.java
@@ -25,7 +25,6 @@
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesCompactSketch;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketch;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketchIterator;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketches;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketch;
 import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketchBuilder;
 import org.testng.Assert;
@@ -86,7 +85,7 @@ public void serializeDeserializeSmallExact() {
     us.update("c", new double[] {1.0});
     ArrayOfDoublesCompactSketch sketch1 = us.compact();
     ArrayOfDoublesSketch sketch2 =
-        ArrayOfDoublesSketches.heapifySketch(MemorySegment.ofArray(sketch1.toByteArray()));
+        ArrayOfDoublesSketch.heapifySketch(MemorySegment.ofArray(sketch1.toByteArray()));
     Assert.assertFalse(sketch2.isEmpty());
     Assert.assertFalse(sketch2.isEstimationMode());
     Assert.assertEquals(sketch2.getEstimate(), 3.0);
@@ -109,13 +108,13 @@ public void serializeDeserializeEstimation() {
       us.update(i, new double[] {1.0});
     }
     MemorySegment wseg = MemorySegment.ofArray(us.toByteArray());
-    ArrayOfDoublesUpdatableSketch wrappedUS = ArrayOfDoublesSketches.wrapUpdatableSketch(wseg);
+    ArrayOfDoublesUpdatableSketch wrappedUS = ArrayOfDoublesSketch.wrapUpdatableSketch(wseg);
     Assert.assertFalse(wrappedUS.isEmpty());
     Assert.assertTrue(wrappedUS.isEstimationMode());
     Assert.assertEquals(wrappedUS.getEstimate(), us.getEstimate());
     Assert.assertEquals(wrappedUS.getThetaLong(), us.getThetaLong());
 
-    ArrayOfDoublesUpdatableSketch heapUS = ArrayOfDoublesSketches.heapifyUpdatableSketch(wseg);
+    ArrayOfDoublesUpdatableSketch heapUS = ArrayOfDoublesSketch.heapifyUpdatableSketch(wseg);
     Assert.assertFalse(heapUS.isEmpty());
     Assert.assertTrue(heapUS.isEstimationMode());
     Assert.assertEquals(heapUS.getEstimate(), us.getEstimate());
@@ -123,7 +122,7 @@ public void serializeDeserializeEstimation() {
 
     ArrayOfDoublesCompactSketch sketch1 = us.compact();
     ArrayOfDoublesSketch sketch2 =
-        ArrayOfDoublesSketches.heapifySketch(MemorySegment.ofArray(sketch1.toByteArray()));
+        ArrayOfDoublesSketch.heapifySketch(MemorySegment.ofArray(sketch1.toByteArray()));
     Assert.assertFalse(sketch2.isEmpty());
     Assert.assertTrue(sketch2.isEstimationMode());
     Assert.assertEquals(sketch2.getEstimate(), sketch1.getEstimate());
@@ -138,6 +137,6 @@ public void deserializeWithWrongSeed() {
     }
     ArrayOfDoublesCompactSketch sketch1 = us.compact();
     MemorySegment seg = MemorySegment.ofArray(sketch1.toByteArray());
-    ArrayOfDoublesSketches.heapifySketch(seg, 123);
+    ArrayOfDoublesSketch.heapifySketch(seg, 123);
   }
 }
diff --git a/src/test/java/org/apache/datasketches/tuple/strings/ArrayOfStringsSketchTest.java b/src/test/java/org/apache/datasketches/tuple/strings/ArrayOfStringsSketchTest.java
index 7287c3429..ef39e6b90 100644
--- a/src/test/java/org/apache/datasketches/tuple/strings/ArrayOfStringsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/strings/ArrayOfStringsSketchTest.java
@@ -24,12 +24,12 @@
 
 import java.lang.foreign.MemorySegment;
 
-import org.apache.datasketches.tuple.AnotB;
-import org.apache.datasketches.tuple.CompactSketch;
-import org.apache.datasketches.tuple.Intersection;
+import org.apache.datasketches.tuple.TupleAnotB;
+import org.apache.datasketches.tuple.CompactTupleSketch;
+import org.apache.datasketches.tuple.TupleIntersection;
 import org.apache.datasketches.tuple.TupleSketchIterator;
-import org.apache.datasketches.tuple.Union;
-import org.apache.datasketches.tuple.strings.ArrayOfStringsSketch;
+import org.apache.datasketches.tuple.TupleUnion;
+import org.apache.datasketches.tuple.strings.ArrayOfStringsTupleSketch;
 import org.apache.datasketches.tuple.strings.ArrayOfStringsSummary;
 import org.apache.datasketches.tuple.strings.ArrayOfStringsSummarySetOperations;
 import org.testng.annotations.Test;
@@ -43,7 +43,7 @@ public class ArrayOfStringsSketchTest {
   @SuppressWarnings("deprecation")
   @Test
   public void checkSketch() {
-    ArrayOfStringsSketch sketch1 = new ArrayOfStringsSketch();
+    ArrayOfStringsTupleSketch sketch1 = new ArrayOfStringsTupleSketch();
     String[][] strArrArr = {{"a","b"},{"c","d"},{"e","f"}};
     int len = strArrArr.length;
     for (int i = 0; i < len; i++) {
@@ -53,28 +53,28 @@ public void checkSketch() {
     printSummaries(sketch1.iterator());
     byte[] array = sketch1.toByteArray();
     MemorySegment wseg = MemorySegment.ofArray(array);
-    ArrayOfStringsSketch sketch2 = new ArrayOfStringsSketch(wseg);
+    ArrayOfStringsTupleSketch sketch2 = new ArrayOfStringsTupleSketch(wseg);
     printSummaries(sketch2.iterator());
     checkSummaries(sketch2, sketch2);
 
     String[] strArr3 = {"g", "h" };
     sketch2.update(strArr3, strArr3);
 
-    Union union = new Union<>(new ArrayOfStringsSummarySetOperations());
+    TupleUnion union = new TupleUnion<>(new ArrayOfStringsSummarySetOperations());
     union.union(sketch1);
     union.union(sketch2);
-    CompactSketch csk = union.getResult();
+    CompactTupleSketch csk = union.getResult();
     //printSummaries(csk.iterator());
     assertEquals(csk.getRetainedEntries(), 4);
 
-    Intersection inter =
-        new Intersection<>(new ArrayOfStringsSummarySetOperations());
+    TupleIntersection inter =
+        new TupleIntersection<>(new ArrayOfStringsSummarySetOperations());
     inter.intersect(sketch1);
     inter.intersect(sketch2);
     csk = inter.getResult();
     assertEquals(csk.getRetainedEntries(), 3);
 
-    AnotB aNotB =  new AnotB<>();
+    TupleAnotB aNotB =  new TupleAnotB<>();
     aNotB.setA(sketch2);
     aNotB.notB(sketch1);
     csk = aNotB.getResult(true);
@@ -82,7 +82,7 @@ public void checkSketch() {
 
   }
 
-  private static void checkSummaries(ArrayOfStringsSketch sk1, ArrayOfStringsSketch sk2) {
+  private static void checkSummaries(ArrayOfStringsTupleSketch sk1, ArrayOfStringsTupleSketch sk2) {
     TupleSketchIterator it1 = sk1.iterator();
     TupleSketchIterator it2 = sk2.iterator();
     while(it1.next() && it2.next()) {
@@ -104,14 +104,14 @@ static void printSummaries(TupleSketchIterator it) {
 
   @Test
   public void checkCopyCtor() {
-    ArrayOfStringsSketch sk1 = new ArrayOfStringsSketch();
+    ArrayOfStringsTupleSketch sk1 = new ArrayOfStringsTupleSketch();
     String[][] strArrArr = {{"a","b"},{"c","d"},{"e","f"}};
     int len = strArrArr.length;
     for (int i = 0; i < len; i++) {
       sk1.update(strArrArr[i], strArrArr[i]);
     }
     assertEquals(sk1.getRetainedEntries(), 3);
-    final ArrayOfStringsSketch sk2 = sk1.copy();
+    final ArrayOfStringsTupleSketch sk2 = sk1.copy();
     assertEquals(sk2.getRetainedEntries(), 3);
   }
 

From 4827385cc01bdba8501cdfe393ac5210cff79527 Mon Sep 17 00:00:00 2001
From: Lee Rhodes 
Date: Thu, 16 Oct 2025 13:18:47 -0700
Subject: [PATCH 6/7] This changes the names to FrequentItemsSketch and
 FrequentLongsSketch.

In KLL, I changed the names of the enum constants to KLL_DOUBLES_SKETCH,
etc.  And the methods to isKllItmesSketch(), etc.
---
 ...msSketch.java => FrequentItemsSketch.java} |  22 ++--
 ...gsSketch.java => FrequentLongsSketch.java} |  26 ++---
 .../kll/KllDirectDoublesSketch.java           |   4 +-
 .../kll/KllDirectFloatsSketch.java            |   4 +-
 .../kll/KllDirectLongsSketch.java             |   4 +-
 .../datasketches/kll/KllDoublesSketch.java    |   6 +-
 .../datasketches/kll/KllFloatsSketch.java     |   6 +-
 .../kll/KllHeapDoublesSketch.java             |   4 +-
 .../datasketches/kll/KllHeapFloatsSketch.java |   4 +-
 .../datasketches/kll/KllHeapItemsSketch.java  |   2 +-
 .../datasketches/kll/KllHeapLongsSketch.java  |   4 +-
 .../apache/datasketches/kll/KllHelper.java    |  36 +++----
 .../datasketches/kll/KllItemsSketch.java      |   6 +-
 .../datasketches/kll/KllLongsSketch.java      |   6 +-
 .../kll/KllMemorySegmentValidate.java         |  14 +--
 .../datasketches/kll/KllPreambleUtil.java     |  44 ++++----
 .../apache/datasketches/kll/KllSketch.java    |  28 ++---
 .../FrequentItemsSketchCrossLanguageTest.java |  20 ++--
 .../frequencies/ItemsSketchTest.java          |  90 ++++++++--------
 .../frequencies/LongsSketchTest.java          | 102 +++++++++---------
 .../frequencies/SerDeCompatibilityTest.java   |  12 +--
 .../kll/KllDirectDoublesSketchTest.java       |  16 +--
 .../kll/KllDirectFloatsSketchTest.java        |  16 +--
 .../kll/KllDirectLongsSketchTest.java         |  16 +--
 .../kll/KllDoublesSketchTest.java             |   6 +-
 .../datasketches/kll/KllFloatsSketchTest.java |   6 +-
 .../datasketches/kll/KllHelperTest.java       |  20 ++--
 .../datasketches/kll/KllItemsSketchTest.java  |  20 ++--
 .../datasketches/kll/KllLongsSketchTest.java  |   6 +-
 .../kll/KllMemorySegmentRequestApp.java       |   2 +-
 .../kll/KllMemoryValidateTest.java            |  28 ++---
 .../kll/KllMiscDirectDoublesTest.java         |  14 +--
 .../kll/KllMiscDirectFloatsTest.java          |  14 +--
 .../kll/KllMiscDirectLongsTest.java           |  14 +--
 .../datasketches/kll/KllMiscDoublesTest.java  |  32 +++---
 .../datasketches/kll/KllMiscFloatsTest.java   |  32 +++---
 .../datasketches/kll/KllMiscItemsTest.java    |  20 ++--
 .../datasketches/kll/KllMiscLongsTest.java    |  32 +++---
 38 files changed, 369 insertions(+), 369 deletions(-)
 rename src/main/java/org/apache/datasketches/frequencies/{ItemsSketch.java => FrequentItemsSketch.java} (97%)
 rename src/main/java/org/apache/datasketches/frequencies/{LongsSketch.java => FrequentLongsSketch.java} (97%)

diff --git a/src/main/java/org/apache/datasketches/frequencies/ItemsSketch.java b/src/main/java/org/apache/datasketches/frequencies/FrequentItemsSketch.java
similarity index 97%
rename from src/main/java/org/apache/datasketches/frequencies/ItemsSketch.java
rename to src/main/java/org/apache/datasketches/frequencies/FrequentItemsSketch.java
index 3fda18de1..dfa72f4e3 100644
--- a/src/main/java/org/apache/datasketches/frequencies/ItemsSketch.java
+++ b/src/main/java/org/apache/datasketches/frequencies/FrequentItemsSketch.java
@@ -148,7 +148,7 @@
  * @author Justin Thaler
  * @author Alexander Saydakov
  */
-public class ItemsSketch {
+public class FrequentItemsSketch {
 
   /**
    * Log2 Maximum length of the arrays internal to the hash map supported by the data
@@ -190,7 +190,7 @@ public class ItemsSketch {
    * 0.75 times * maxMapSize. Both the ultimate accuracy and size of this sketch are
    * functions of maxMapSize.
    */
-  public ItemsSketch(final int maxMapSize) {
+  public FrequentItemsSketch(final int maxMapSize) {
     this(exactLog2OfInt(maxMapSize, "maxMapSize"), LG_MIN_MAP_SIZE);
   }
 
@@ -205,7 +205,7 @@ public ItemsSketch(final int maxMapSize) {
    * @param lgCurMapSize Log2 of the starting (current) physical size of the internal hash
    * map managed by this sketch.
    */
-  ItemsSketch(final int lgMaxMapSize, final int lgCurMapSize) {
+  FrequentItemsSketch(final int lgMaxMapSize, final int lgCurMapSize) {
     //set initial size of hash map
     this.lgMaxMapSize = Math.max(lgMaxMapSize, LG_MIN_MAP_SIZE);
     final int lgCurMapSz = Math.max(lgCurMapSize, LG_MIN_MAP_SIZE);
@@ -226,7 +226,7 @@ public ItemsSketch(final int maxMapSize) {
    * @param serDe an instance of ArrayOfItemsSerDe
    * @return a sketch instance of this class.
    */
-  public static  ItemsSketch getInstance(final MemorySegment srcSeg,
+  public static  FrequentItemsSketch getInstance(final MemorySegment srcSeg,
       final ArrayOfItemsSerDe serDe) {
     Objects.requireNonNull(srcSeg, "srcSeg must not be null.");
     Objects.requireNonNull(serDe, "serDe must not be null.");
@@ -263,13 +263,13 @@ public static  ItemsSketch getInstance(final MemorySegment srcSeg,
     }
 
     if (empty) {
-      return new ItemsSketch<>(lgMaxMapSize, LG_MIN_MAP_SIZE);
+      return new FrequentItemsSketch<>(lgMaxMapSize, LG_MIN_MAP_SIZE);
     }
     //get full preamble
     final long[] preArr = new long[preLongs];
     MemorySegment.copy(srcSeg, JAVA_LONG_UNALIGNED, 0, preArr, 0, preLongs);
 
-    final ItemsSketch fis = new ItemsSketch<>(lgMaxMapSize, lgCurMapSize);
+    final FrequentItemsSketch fis = new FrequentItemsSketch<>(lgMaxMapSize, lgCurMapSize);
     fis.streamWeight = 0; //update after
     fis.offset = preArr[3];
 
@@ -461,7 +461,7 @@ public boolean isEmpty() {
    * @return a sketch whose estimates are within the guarantees of the
    * largest error tolerance of the two merged sketches.
    */
-  public ItemsSketch merge(final ItemsSketch other) {
+  public FrequentItemsSketch merge(final FrequentItemsSketch other) {
     if ((other == null) || other.isEmpty()) { return this; }
 
     final long streamLen = streamWeight + other.streamWeight; //capture before merge
@@ -551,18 +551,18 @@ public String toString() {
   }
 
   /**
-   * Returns a human readable string of the preamble of a byte array image of a ItemsSketch.
+   * Returns a human readable string of the preamble of a byte array image of a FrequentItemsSketch.
    * @param byteArr the given byte array
-   * @return a human readable string of the preamble of a byte array image of a ItemsSketch.
+   * @return a human readable string of the preamble of a byte array image of a FrequentItemsSketch.
    */
   public static String toString(final byte[] byteArr) {
     return toString(MemorySegment.ofArray(byteArr));
   }
 
   /**
-   * Returns a human readable string of the preamble of a MemorySegment image of a ItemsSketch.
+   * Returns a human readable string of the preamble of a MemorySegment image of a FrequentItemsSketch.
    * @param seg the given MemorySegment object
-   * @return a human readable string of the preamble of a MemorySegment image of a ItemsSketch.
+   * @return a human readable string of the preamble of a MemorySegment image of a FrequentItemsSketch.
    */
   public static String toString(final MemorySegment seg) {
     return PreambleUtil.preambleToString(seg);
diff --git a/src/main/java/org/apache/datasketches/frequencies/LongsSketch.java b/src/main/java/org/apache/datasketches/frequencies/FrequentLongsSketch.java
similarity index 97%
rename from src/main/java/org/apache/datasketches/frequencies/LongsSketch.java
rename to src/main/java/org/apache/datasketches/frequencies/FrequentLongsSketch.java
index d0adda092..04b2c1d5e 100644
--- a/src/main/java/org/apache/datasketches/frequencies/LongsSketch.java
+++ b/src/main/java/org/apache/datasketches/frequencies/FrequentLongsSketch.java
@@ -144,7 +144,7 @@
  * @author Lee Rhodes
  */
 @SuppressFBWarnings(value = "SIC_INNER_SHOULD_BE_STATIC_ANON", justification = "Harmless, fix later")
-public class LongsSketch {
+public class FrequentLongsSketch {
 
   private static final int STR_PREAMBLE_TOKENS = 6;
 
@@ -188,7 +188,7 @@ public class LongsSketch {
    * 0.75 times * maxMapSize. Both the ultimate accuracy and size of this sketch are a
    * function of maxMapSize.
    */
-  public LongsSketch(final int maxMapSize) {
+  public FrequentLongsSketch(final int maxMapSize) {
     this(exactLog2OfInt(maxMapSize, "maxMapSize"), LG_MIN_MAP_SIZE);
   }
 
@@ -203,7 +203,7 @@ public LongsSketch(final int maxMapSize) {
    * @param lgCurMapSize Log2 of the starting (current) physical size of the internal hash
    * map managed by this sketch.
    */
-  LongsSketch(final int lgMaxMapSize, final int lgCurMapSize) {
+  FrequentLongsSketch(final int lgMaxMapSize, final int lgCurMapSize) {
     //set initial size of hash map
     this.lgMaxMapSize = Math.max(lgMaxMapSize, LG_MIN_MAP_SIZE);
     final int lgCurMapSz = Math.max(lgCurMapSize, LG_MIN_MAP_SIZE);
@@ -222,7 +222,7 @@ public LongsSketch(final int maxMapSize) {
    * @param srcSeg a MemorySegment representation of a sketch of this class.
    * @return a sketch instance of this class.
    */
-  public static LongsSketch getInstance(final MemorySegment srcSeg) {
+  public static FrequentLongsSketch getInstance(final MemorySegment srcSeg) {
     Objects.requireNonNull(srcSeg, "Source MemorySegment must not be null.");
     final long pre0 = PreambleUtil.checkPreambleSize(srcSeg); //check MemorySegment capacity
     final int maxPreLongs = Family.FREQUENCY.getMaxPreLongs();
@@ -256,13 +256,13 @@ public static LongsSketch getInstance(final MemorySegment srcSeg) {
     }
 
     if (empty) {
-      return new LongsSketch(lgMaxMapSize, LG_MIN_MAP_SIZE);
+      return new FrequentLongsSketch(lgMaxMapSize, LG_MIN_MAP_SIZE);
     }
     //get full preamble
     final long[] preArr = new long[preLongs];
     MemorySegment.copy(srcSeg, JAVA_LONG_UNALIGNED, 0, preArr, 0, preLongs);
 
-    final LongsSketch fls = new LongsSketch(lgMaxMapSize, lgCurMapSize);
+    final FrequentLongsSketch fls = new FrequentLongsSketch(lgMaxMapSize, lgCurMapSize);
     fls.streamWeight = 0; //update after
     fls.offset = preArr[3];
 
@@ -294,7 +294,7 @@ public static LongsSketch getInstance(final MemorySegment srcSeg) {
    * @param string a String representation of a sketch of this class.
    * @return a sketch instance of this class.
    */
-  public static LongsSketch getInstance(final String string) {
+  public static FrequentLongsSketch getInstance(final String string) {
     Objects.requireNonNull(string, "string must not be null.");
     final String[] tokens = string.split(",");
     if (tokens.length < (STR_PREAMBLE_TOKENS + 2)) {
@@ -328,7 +328,7 @@ public static LongsSketch getInstance(final String string) {
             + ", numActive: " + numActive);
     }
 
-    final LongsSketch sketch = new LongsSketch(lgMax, lgCur);
+    final FrequentLongsSketch sketch = new FrequentLongsSketch(lgMax, lgCur);
     sketch.streamWeight = streamWt;
     sketch.offset = offset;
     sketch.hashMap = deserializeFromStringArray(tokens);
@@ -512,7 +512,7 @@ public boolean isEmpty() {
    * @return a sketch whose estimates are within the guarantees of the
    * largest error tolerance of the two merged sketches.
    */
-  public LongsSketch merge(final LongsSketch other) {
+  public FrequentLongsSketch merge(final FrequentLongsSketch other) {
     if ((other == null) || other.isEmpty()) { return this; }
 
     final long streamWt = streamWeight + other.streamWeight; //capture before merge
@@ -620,18 +620,18 @@ public String toString() {
   }
 
   /**
-   * Returns a human readable string of the preamble of a byte array image of a LongsSketch.
+   * Returns a human readable string of the preamble of a byte array image of a FrequentLongsSketch.
    * @param byteArr the given byte array
-   * @return a human readable string of the preamble of a byte array image of a LongsSketch.
+   * @return a human readable string of the preamble of a byte array image of a FrequentLongsSketch.
    */
   public static String toString(final byte[] byteArr) {
     return toString(MemorySegment.ofArray(byteArr));
   }
 
   /**
-   * Returns a human readable string of the preamble of a MemorySegment image of a LongsSketch.
+   * Returns a human readable string of the preamble of a MemorySegment image of a FrequentLongsSketch.
    * @param seg the given MemorySegment object
-   * @return  a human readable string of the preamble of a MemorySegment image of a LongsSketch.
+   * @return  a human readable string of the preamble of a MemorySegment image of a FrequentLongsSketch.
    */
   public static String toString(final MemorySegment seg) {
     return PreambleUtil.preambleToString(seg);
diff --git a/src/main/java/org/apache/datasketches/kll/KllDirectDoublesSketch.java b/src/main/java/org/apache/datasketches/kll/KllDirectDoublesSketch.java
index 060423e50..0283c015b 100644
--- a/src/main/java/org/apache/datasketches/kll/KllDirectDoublesSketch.java
+++ b/src/main/java/org/apache/datasketches/kll/KllDirectDoublesSketch.java
@@ -44,7 +44,7 @@
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_FULL;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_SINGLE;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.UPDATABLE;
-import static org.apache.datasketches.kll.KllSketch.SketchType.DOUBLES_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_DOUBLES_SKETCH;
 
 import java.lang.foreign.MemorySegment;
 
@@ -111,7 +111,7 @@ static KllDirectDoublesSketch newDirectUpdatableInstance(
     offset += 2 * ITEM_BYTES;
     //new empty items array
     MemorySegment.copy(new double[k], 0, dstSeg, JAVA_DOUBLE_UNALIGNED, offset, k);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(dstSeg, DOUBLES_SKETCH, null);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(dstSeg, KLL_DOUBLES_SKETCH, null);
     final MemorySegment wSeg = dstSeg;
     return new KllDirectDoublesSketch(wSeg, segVal, mSegmentRequest);
   }
diff --git a/src/main/java/org/apache/datasketches/kll/KllDirectFloatsSketch.java b/src/main/java/org/apache/datasketches/kll/KllDirectFloatsSketch.java
index 857338a0d..552df0ffb 100644
--- a/src/main/java/org/apache/datasketches/kll/KllDirectFloatsSketch.java
+++ b/src/main/java/org/apache/datasketches/kll/KllDirectFloatsSketch.java
@@ -44,7 +44,7 @@
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_FULL;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_SINGLE;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.UPDATABLE;
-import static org.apache.datasketches.kll.KllSketch.SketchType.FLOATS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_FLOATS_SKETCH;
 
 import java.lang.foreign.MemorySegment;
 
@@ -111,7 +111,7 @@ static KllDirectFloatsSketch newDirectUpdatableInstance(
     offset += 2 * ITEM_BYTES;
     //new empty items array
     MemorySegment.copy(new float[k], 0, dstSeg, JAVA_FLOAT_UNALIGNED, offset, k);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(dstSeg, FLOATS_SKETCH, null);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(dstSeg, KLL_FLOATS_SKETCH, null);
     final MemorySegment wSeg = dstSeg;
     return new KllDirectFloatsSketch(wSeg, segVal, mSegmentRequest);
   }
diff --git a/src/main/java/org/apache/datasketches/kll/KllDirectLongsSketch.java b/src/main/java/org/apache/datasketches/kll/KllDirectLongsSketch.java
index f36ade66d..1de0b2ff1 100644
--- a/src/main/java/org/apache/datasketches/kll/KllDirectLongsSketch.java
+++ b/src/main/java/org/apache/datasketches/kll/KllDirectLongsSketch.java
@@ -44,7 +44,7 @@
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_FULL;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_SINGLE;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.UPDATABLE;
-import static org.apache.datasketches.kll.KllSketch.SketchType.LONGS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_LONGS_SKETCH;
 
 import java.lang.foreign.MemorySegment;
 
@@ -111,7 +111,7 @@ static KllDirectLongsSketch newDirectUpdatableInstance(
     offset += 2 * ITEM_BYTES;
     //new empty items array
     MemorySegment.copy(new long[k], 0, dstSeg, JAVA_LONG_UNALIGNED, offset, k);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(dstSeg, LONGS_SKETCH, null);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(dstSeg, KLL_LONGS_SKETCH, null);
     final MemorySegment wSeg = dstSeg;
     return new KllDirectLongsSketch(wSeg, segVal, mSegmentRequest);
   }
diff --git a/src/main/java/org/apache/datasketches/kll/KllDoublesSketch.java b/src/main/java/org/apache/datasketches/kll/KllDoublesSketch.java
index 0e4b48794..541d551c1 100644
--- a/src/main/java/org/apache/datasketches/kll/KllDoublesSketch.java
+++ b/src/main/java/org/apache/datasketches/kll/KllDoublesSketch.java
@@ -23,7 +23,7 @@
 import static java.lang.Math.min;
 import static org.apache.datasketches.common.ByteArrayUtil.putDoubleLE;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.UPDATABLE;
-import static org.apache.datasketches.kll.KllSketch.SketchType.DOUBLES_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_DOUBLES_SKETCH;
 
 import java.lang.foreign.MemorySegment;
 import java.util.Arrays;
@@ -51,7 +51,7 @@ public abstract class KllDoublesSketch extends KllSketch implements QuantilesDou
    * @param sketchStructure the current sketch structure
    */
   KllDoublesSketch(final SketchStructure sketchStructure) {
-    super(SketchType.DOUBLES_SKETCH, sketchStructure);
+    super(SketchType.KLL_DOUBLES_SKETCH, sketchStructure);
   }
 
   /**
@@ -167,7 +167,7 @@ public static KllDoublesSketch wrap(final MemorySegment srcSeg) {
    */
   public static KllDoublesSketch wrap(final MemorySegment srcSeg, final MemorySegmentRequest mSegReq) {
     Objects.requireNonNull(srcSeg, "Parameter 'srcSeg' must not be null");
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(srcSeg, DOUBLES_SKETCH);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(srcSeg, KLL_DOUBLES_SKETCH);
     return new KllDirectDoublesSketch(srcSeg, segVal, mSegReq);
   }
 
diff --git a/src/main/java/org/apache/datasketches/kll/KllFloatsSketch.java b/src/main/java/org/apache/datasketches/kll/KllFloatsSketch.java
index d41abb891..b2741047c 100644
--- a/src/main/java/org/apache/datasketches/kll/KllFloatsSketch.java
+++ b/src/main/java/org/apache/datasketches/kll/KllFloatsSketch.java
@@ -23,7 +23,7 @@
 import static java.lang.Math.min;
 import static org.apache.datasketches.common.ByteArrayUtil.putFloatLE;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.UPDATABLE;
-import static org.apache.datasketches.kll.KllSketch.SketchType.FLOATS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_FLOATS_SKETCH;
 
 import java.lang.foreign.MemorySegment;
 import java.util.Arrays;
@@ -51,7 +51,7 @@ public abstract class KllFloatsSketch extends KllSketch implements QuantilesFloa
    * @param sketchStructure the current sketch structure
    */
   KllFloatsSketch(final SketchStructure sketchStructure) {
-    super(SketchType.FLOATS_SKETCH, sketchStructure);
+    super(SketchType.KLL_FLOATS_SKETCH, sketchStructure);
   }
 
   /**
@@ -167,7 +167,7 @@ public static KllFloatsSketch wrap(final MemorySegment srcSeg) {
    */
   public static KllFloatsSketch wrap(final MemorySegment srcSeg, final MemorySegmentRequest mSegReq) {
     Objects.requireNonNull(srcSeg, "Parameter 'srcSeg' must not be null");
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(srcSeg, FLOATS_SKETCH);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(srcSeg, KLL_FLOATS_SKETCH);
     return new KllDirectFloatsSketch(srcSeg, segVal, mSegReq);
   }
 
diff --git a/src/main/java/org/apache/datasketches/kll/KllHeapDoublesSketch.java b/src/main/java/org/apache/datasketches/kll/KllHeapDoublesSketch.java
index ab50741c4..c6de1a5d8 100644
--- a/src/main/java/org/apache/datasketches/kll/KllHeapDoublesSketch.java
+++ b/src/main/java/org/apache/datasketches/kll/KllHeapDoublesSketch.java
@@ -27,7 +27,7 @@
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_FULL;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_SINGLE;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.UPDATABLE;
-import static org.apache.datasketches.kll.KllSketch.SketchType.DOUBLES_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_DOUBLES_SKETCH;
 
 import java.lang.foreign.MemorySegment;
 import java.util.Arrays;
@@ -154,7 +154,7 @@ else if (segStructure == COMPACT_FULL) {
 
   static KllHeapDoublesSketch heapifyImpl(final MemorySegment srcSeg) {
     Objects.requireNonNull(srcSeg, "Parameter 'srcSeg' must not be null");
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(srcSeg, DOUBLES_SKETCH);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(srcSeg, KLL_DOUBLES_SKETCH);
     return new KllHeapDoublesSketch(srcSeg, segVal);
   }
 
diff --git a/src/main/java/org/apache/datasketches/kll/KllHeapFloatsSketch.java b/src/main/java/org/apache/datasketches/kll/KllHeapFloatsSketch.java
index d14864969..55b990d3c 100644
--- a/src/main/java/org/apache/datasketches/kll/KllHeapFloatsSketch.java
+++ b/src/main/java/org/apache/datasketches/kll/KllHeapFloatsSketch.java
@@ -27,7 +27,7 @@
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_FULL;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_SINGLE;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.UPDATABLE;
-import static org.apache.datasketches.kll.KllSketch.SketchType.FLOATS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_FLOATS_SKETCH;
 
 import java.lang.foreign.MemorySegment;
 import java.util.Arrays;
@@ -154,7 +154,7 @@ else if (segStructure == COMPACT_FULL) {
 
   static KllHeapFloatsSketch heapifyImpl(final MemorySegment srcSeg) {
     Objects.requireNonNull(srcSeg, "Parameter 'srcSeg' must not be null");
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(srcSeg, FLOATS_SKETCH);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(srcSeg, KLL_FLOATS_SKETCH);
     return new KllHeapFloatsSketch(srcSeg, segVal);
   }
 
diff --git a/src/main/java/org/apache/datasketches/kll/KllHeapItemsSketch.java b/src/main/java/org/apache/datasketches/kll/KllHeapItemsSketch.java
index c1b7401dc..74640e902 100644
--- a/src/main/java/org/apache/datasketches/kll/KllHeapItemsSketch.java
+++ b/src/main/java/org/apache/datasketches/kll/KllHeapItemsSketch.java
@@ -111,7 +111,7 @@ final class KllHeapItemsSketch extends KllItemsSketch {
       final Comparator comparator,
       final ArrayOfItemsSerDe serDe) {
     super(SketchStructure.UPDATABLE, comparator, serDe);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(srcSeg, SketchType.ITEMS_SKETCH, serDe);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(srcSeg, SketchType.KLL_ITEMS_SKETCH, serDe);
     k = segVal.k;
     m = segVal.m;
     levelsArr = segVal.levelsArr;
diff --git a/src/main/java/org/apache/datasketches/kll/KllHeapLongsSketch.java b/src/main/java/org/apache/datasketches/kll/KllHeapLongsSketch.java
index 9eebe5e99..21851b8b8 100644
--- a/src/main/java/org/apache/datasketches/kll/KllHeapLongsSketch.java
+++ b/src/main/java/org/apache/datasketches/kll/KllHeapLongsSketch.java
@@ -27,7 +27,7 @@
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_FULL;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_SINGLE;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.UPDATABLE;
-import static org.apache.datasketches.kll.KllSketch.SketchType.LONGS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_LONGS_SKETCH;
 
 import java.lang.foreign.MemorySegment;
 import java.util.Arrays;
@@ -154,7 +154,7 @@ else if (segStructure == COMPACT_FULL) {
 
   static KllHeapLongsSketch heapifyImpl(final MemorySegment srcSeg) {
     Objects.requireNonNull(srcSeg, "Parameter 'srcSeg' must not be null");
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(srcSeg, LONGS_SKETCH);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(srcSeg, KLL_LONGS_SKETCH);
     return new KllHeapLongsSketch(srcSeg, segVal);
   }
 
diff --git a/src/main/java/org/apache/datasketches/kll/KllHelper.java b/src/main/java/org/apache/datasketches/kll/KllHelper.java
index 73bfb5283..4b6256cde 100644
--- a/src/main/java/org/apache/datasketches/kll/KllHelper.java
+++ b/src/main/java/org/apache/datasketches/kll/KllHelper.java
@@ -39,10 +39,10 @@
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_FULL;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_SINGLE;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.UPDATABLE;
-import static org.apache.datasketches.kll.KllSketch.SketchType.DOUBLES_SKETCH;
-import static org.apache.datasketches.kll.KllSketch.SketchType.FLOATS_SKETCH;
-import static org.apache.datasketches.kll.KllSketch.SketchType.ITEMS_SKETCH;
-import static org.apache.datasketches.kll.KllSketch.SketchType.LONGS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_DOUBLES_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_FLOATS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_ITEMS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_LONGS_SKETCH;
 import static org.apache.datasketches.quantilescommon.QuantilesAPI.UNSUPPORTED_MSG;
 
 import java.lang.foreign.MemorySegment;
@@ -230,7 +230,7 @@ static GrowthStats getGrowthSchemeForGivenN(
       final long n,
       final SketchType sketchType,
       final boolean printGrowthScheme) {
-    if (sketchType == ITEMS_SKETCH) { throw new SketchesArgumentException(UNSUPPORTED_MSG); }
+    if (sketchType == KLL_ITEMS_SKETCH) { throw new SketchesArgumentException(UNSUPPORTED_MSG); }
     LevelStats lvlStats;
     final GrowthStats gStats = new GrowthStats();
     gStats.numLevels = 0;
@@ -341,7 +341,7 @@ static MemorySegment memorySegmentSpaceMgmt(
       final int newLevelsArrLen,
       final int newItemsArrLen) {
     final KllSketch.SketchType sketchType = sketch.sketchType;
-    if (sketchType == ITEMS_SKETCH) { throw new SketchesArgumentException(UNSUPPORTED_MSG); }
+    if (sketchType == KLL_ITEMS_SKETCH) { throw new SketchesArgumentException(UNSUPPORTED_MSG); }
     final MemorySegment oldWseg = sketch.getMemorySegment();
     if (oldWseg == null) {
       return null;
@@ -434,7 +434,7 @@ static long sumTheSampleWeights(final int num_levels, final int[] levels) {
 
   static  byte[] toByteArray(final KllSketch srcSk, final boolean updatable) {
     //ITEMS_SKETCH byte array is never updatable
-    final boolean myUpdatable = srcSk.sketchType == ITEMS_SKETCH ? false : updatable;
+    final boolean myUpdatable = srcSk.sketchType == KLL_ITEMS_SKETCH ? false : updatable;
     final long srcN = srcSk.getN();
     final SketchStructure tgtStructure;
     if (myUpdatable) { tgtStructure = UPDATABLE; }
@@ -534,12 +534,12 @@ static String toStringImpl(final KllSketch sketch, final boolean withLevels, fin
     sb.append("   Retained Items         : ").append(sketch.getNumRetained()).append(LS);
     sb.append("   Free Space             : ").append(sketch.levelsArr[0]).append(LS);
     sb.append("   ReadOnly               : ").append(readOnlyStr).append(LS);
-    if (sketchType != ITEMS_SKETCH) {
+    if (sketchType != KLL_ITEMS_SKETCH) {
       sb.append("   Updatable Storage Bytes: ").append(sketch.currentSerializedSizeBytes(true)).append(LS);
     }
     sb.append("   Compact Storage Bytes  : ").append(sketch.currentSerializedSizeBytes(false)).append(LS);
 
-    final String emptyStr = (sketchType == ITEMS_SKETCH) ? "Null" : "NaN";
+    final String emptyStr = (sketchType == KLL_ITEMS_SKETCH) ? "Null" : "NaN";
 
     sb.append("   Min Item               : ").append(sketch.isEmpty() ? emptyStr : sketch.getMinItemAsString())
         .append(LS);
@@ -604,7 +604,7 @@ static void addEmptyTopLevelToCompletelyFullSketch(final KllSketch sketch) {
     Object minItem = null;
     Object maxItem = null;
 
-    if (sketchType == DOUBLES_SKETCH) {
+    if (sketchType == KLL_DOUBLES_SKETCH) {
       final KllDoublesSketch dblSk = (KllDoublesSketch) sketch;
       myCurDoubleItemsArr = dblSk.getDoubleItemsArray();
       minDouble = dblSk.getMinItem();
@@ -612,7 +612,7 @@ static void addEmptyTopLevelToCompletelyFullSketch(final KllSketch sketch) {
       //assert we are following a certain growth scheme
       assert myCurDoubleItemsArr.length == myCurTotalItemsCapacity;
     }
-    else if (sketchType == FLOATS_SKETCH) {
+    else if (sketchType == KLL_FLOATS_SKETCH) {
       final KllFloatsSketch fltSk = (KllFloatsSketch) sketch;
       myCurFloatItemsArr = fltSk.getFloatItemsArray();
       minFloat = fltSk.getMinItem();
@@ -620,7 +620,7 @@ else if (sketchType == FLOATS_SKETCH) {
       //assert we are following a certain growth scheme
       assert myCurFloatItemsArr.length == myCurTotalItemsCapacity;
     }
-    else if (sketchType == LONGS_SKETCH) {
+    else if (sketchType == KLL_LONGS_SKETCH) {
       final KllLongsSketch lngSk = (KllLongsSketch) sketch;
       myCurLongItemsArr = lngSk.getLongItemsArray();
       minLong = lngSk.getMinItem();
@@ -661,17 +661,17 @@ else if (sketchType == LONGS_SKETCH) {
     myNewLevelsArr[myNewNumLevels] = myNewTotalItemsCapacity; // initialize the new "extra" index at the top
 
     // GROW items ARRAY
-    if (sketchType == DOUBLES_SKETCH) {
+    if (sketchType == KLL_DOUBLES_SKETCH) {
       myNewDoubleItemsArr = new double[myNewTotalItemsCapacity];
       // copy and shift the current data into the new array
       System.arraycopy(myCurDoubleItemsArr, 0, myNewDoubleItemsArr, deltaItemsCap, myCurTotalItemsCapacity);
     }
-    else if (sketchType == FLOATS_SKETCH) {
+    else if (sketchType == KLL_FLOATS_SKETCH) {
       myNewFloatItemsArr = new float[myNewTotalItemsCapacity];
       // copy and shift the current items data into the new array
       System.arraycopy(myCurFloatItemsArr, 0, myNewFloatItemsArr, deltaItemsCap, myCurTotalItemsCapacity);
     }
-    else if (sketchType == LONGS_SKETCH) {
+    else if (sketchType == KLL_LONGS_SKETCH) {
       myNewLongItemsArr = new long[myNewTotalItemsCapacity];
       // copy and shift the current items data into the new array
       System.arraycopy(myCurLongItemsArr, 0, myNewLongItemsArr, deltaItemsCap, myCurTotalItemsCapacity);
@@ -691,19 +691,19 @@ else if (sketchType == LONGS_SKETCH) {
     //update our sketch with new expanded spaces
     sketch.setNumLevels(myNewNumLevels);   //for off-heap only
     sketch.setLevelsArray(myNewLevelsArr); //the KllSketch copy
-    if (sketchType == DOUBLES_SKETCH) {
+    if (sketchType == KLL_DOUBLES_SKETCH) {
       final KllDoublesSketch dblSk = (KllDoublesSketch) sketch;
       dblSk.setMinItem(minDouble);
       dblSk.setMaxItem(maxDouble);
       dblSk.setDoubleItemsArray(myNewDoubleItemsArr);
     }
-    else if (sketchType == FLOATS_SKETCH) {
+    else if (sketchType == KLL_FLOATS_SKETCH) {
       final KllFloatsSketch fltSk = (KllFloatsSketch) sketch;
       fltSk.setMinItem(minFloat);
       fltSk.setMaxItem(maxFloat);
       fltSk.setFloatItemsArray(myNewFloatItemsArr);
     }
-    else if (sketchType == LONGS_SKETCH) {
+    else if (sketchType == KLL_LONGS_SKETCH) {
       final KllLongsSketch lngSk = (KllLongsSketch) sketch;
       lngSk.setMinItem(minLong);
       lngSk.setMaxItem(maxLong);
diff --git a/src/main/java/org/apache/datasketches/kll/KllItemsSketch.java b/src/main/java/org/apache/datasketches/kll/KllItemsSketch.java
index ff0ef8e75..6e3b6c374 100644
--- a/src/main/java/org/apache/datasketches/kll/KllItemsSketch.java
+++ b/src/main/java/org/apache/datasketches/kll/KllItemsSketch.java
@@ -22,7 +22,7 @@
 import static java.lang.Math.max;
 import static java.lang.Math.min;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.UPDATABLE;
-import static org.apache.datasketches.kll.KllSketch.SketchType.ITEMS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_ITEMS_SKETCH;
 
 import java.lang.foreign.MemorySegment;
 import java.lang.reflect.Array;
@@ -56,7 +56,7 @@ public abstract class KllItemsSketch extends KllSketch implements QuantilesGe
       final SketchStructure skStructure,
       final Comparator comparator,
       final ArrayOfItemsSerDe serDe) {
-    super(ITEMS_SKETCH, skStructure);
+    super(KLL_ITEMS_SKETCH, skStructure);
     Objects.requireNonNull(comparator, "Comparator must not be null.");
     Objects.requireNonNull(serDe, "SerDe must not be null.");
     this.comparator = comparator;
@@ -135,7 +135,7 @@ public static  KllItemsSketch wrap(
       final MemorySegment srcSeg,
       final Comparator comparator,
       final ArrayOfItemsSerDe serDe) {
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(srcSeg, SketchType.ITEMS_SKETCH, serDe);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(srcSeg, SketchType.KLL_ITEMS_SKETCH, serDe);
     return new KllDirectCompactItemsSketch<>(segVal, comparator, serDe);
   }
 
diff --git a/src/main/java/org/apache/datasketches/kll/KllLongsSketch.java b/src/main/java/org/apache/datasketches/kll/KllLongsSketch.java
index 6acf93799..4826d8392 100644
--- a/src/main/java/org/apache/datasketches/kll/KllLongsSketch.java
+++ b/src/main/java/org/apache/datasketches/kll/KllLongsSketch.java
@@ -23,7 +23,7 @@
 import static java.lang.Math.min;
 import static org.apache.datasketches.common.ByteArrayUtil.putLongLE;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.UPDATABLE;
-import static org.apache.datasketches.kll.KllSketch.SketchType.LONGS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_LONGS_SKETCH;
 
 import java.lang.foreign.MemorySegment;
 import java.util.Arrays;
@@ -51,7 +51,7 @@ public abstract class KllLongsSketch extends KllSketch implements QuantilesLongs
    * @param sketchStructure the current sketch structure
    */
   KllLongsSketch(final SketchStructure sketchStructure) {
-    super(SketchType.LONGS_SKETCH, sketchStructure);
+    super(SketchType.KLL_LONGS_SKETCH, sketchStructure);
   }
 
   /**
@@ -167,7 +167,7 @@ public static KllLongsSketch wrap(final MemorySegment srcSeg) {
    */
   public static KllLongsSketch wrap(final MemorySegment srcSeg, final MemorySegmentRequest mSegReq) {
     Objects.requireNonNull(srcSeg, "Parameter 'srcSeg' must not be null");
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(srcSeg, LONGS_SKETCH);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(srcSeg, KLL_LONGS_SKETCH);
     return new KllDirectLongsSketch(srcSeg, segVal, mSegReq);
   }
 
diff --git a/src/main/java/org/apache/datasketches/kll/KllMemorySegmentValidate.java b/src/main/java/org/apache/datasketches/kll/KllMemorySegmentValidate.java
index 32a7b0797..33f6904ec 100644
--- a/src/main/java/org/apache/datasketches/kll/KllMemorySegmentValidate.java
+++ b/src/main/java/org/apache/datasketches/kll/KllMemorySegmentValidate.java
@@ -33,9 +33,9 @@
 import static org.apache.datasketches.kll.KllPreambleUtil.getMemorySegmentNumLevels;
 import static org.apache.datasketches.kll.KllPreambleUtil.getMemorySegmentPreInts;
 import static org.apache.datasketches.kll.KllPreambleUtil.getMemorySegmentSerVer;
-import static org.apache.datasketches.kll.KllSketch.SketchType.DOUBLES_SKETCH;
-import static org.apache.datasketches.kll.KllSketch.SketchType.FLOATS_SKETCH;
-import static org.apache.datasketches.kll.KllSketch.SketchType.ITEMS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_DOUBLES_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_FLOATS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_ITEMS_SKETCH;
 
 import java.lang.foreign.MemorySegment;
 
@@ -106,8 +106,8 @@ final class KllMemorySegmentValidate {
     //flags
     emptyFlag = getMemorySegmentEmptyFlag(srcSeg);
     level0SortedFlag  = getMemorySegmentLevelZeroSortedFlag(srcSeg);
-    if (sketchType == DOUBLES_SKETCH) { typeBytes = Double.BYTES; }
-    else if (sketchType == FLOATS_SKETCH) { typeBytes = Float.BYTES; }
+    if (sketchType == KLL_DOUBLES_SKETCH) { typeBytes = Double.BYTES; }
+    else if (sketchType == KLL_FLOATS_SKETCH) { typeBytes = Float.BYTES; }
     else { typeBytes = 0; }
     validate();
   }
@@ -143,7 +143,7 @@ private void validate() {
         minK = k;        //assumed
         numLevels = 1;   //assumed
         levelsArr = new int[] {k - 1, k};
-        if (sketchType == ITEMS_SKETCH) {
+        if (sketchType == KLL_ITEMS_SKETCH) {
           sketchBytes = DATA_START_ADR_SINGLE_ITEM + serDe.sizeOf(srcSeg, DATA_START_ADR_SINGLE_ITEM, 1);
         } else {
           sketchBytes = DATA_START_ADR_SINGLE_ITEM + typeBytes;
@@ -178,7 +178,7 @@ static int computeSketchBytes( //for COMPACT_FULL or UPDATABLE only
     final int numItems = updatable ? capacityItems : retainedItems;
 
     int offsetBytes = DATA_START_ADR + (levelsLen * Integer.BYTES); //levels array
-    if (sketchType == ITEMS_SKETCH) {
+    if (sketchType == KLL_ITEMS_SKETCH) {
       if (serDe instanceof ArrayOfBooleansSerDe) {
         offsetBytes += serDe.sizeOf(srcSeg, offsetBytes, numItems) + 2; //2 for min & max
       } else {
diff --git a/src/main/java/org/apache/datasketches/kll/KllPreambleUtil.java b/src/main/java/org/apache/datasketches/kll/KllPreambleUtil.java
index 0e22c0195..e7df5cfd6 100644
--- a/src/main/java/org/apache/datasketches/kll/KllPreambleUtil.java
+++ b/src/main/java/org/apache/datasketches/kll/KllPreambleUtil.java
@@ -31,10 +31,10 @@
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_FULL;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_SINGLE;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.UPDATABLE;
-import static org.apache.datasketches.kll.KllSketch.SketchType.DOUBLES_SKETCH;
-import static org.apache.datasketches.kll.KllSketch.SketchType.FLOATS_SKETCH;
-import static org.apache.datasketches.kll.KllSketch.SketchType.ITEMS_SKETCH;
-import static org.apache.datasketches.kll.KllSketch.SketchType.LONGS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_DOUBLES_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_FLOATS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_ITEMS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_LONGS_SKETCH;
 
 import java.lang.foreign.MemorySegment;
 import java.util.Objects;
@@ -223,7 +223,7 @@ static String toString(final MemorySegment seg, final SketchType sketchType, fin
    */
   static  String toString(final MemorySegment seg, final SketchType sketchType, final boolean includeData,
       final ArrayOfItemsSerDe serDe) {
-    if (sketchType == ITEMS_SKETCH) {
+    if (sketchType == KLL_ITEMS_SKETCH) {
       Objects.requireNonNull(serDe, "SerDe parameter must not be null for ITEMS_SKETCH.");
     }
     final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(seg, sketchType, serDe);
@@ -290,44 +290,44 @@ static  String toString(final MemorySegment seg, final SketchType sketchType,
         }
 
         sb.append("MIN/MAX:").append(LS);
-        if (sketchType == DOUBLES_SKETCH) {
+        if (sketchType == KLL_DOUBLES_SKETCH) {
           sb.append(seg.get(JAVA_DOUBLE_UNALIGNED, offsetBytes)).append(LS);
           offsetBytes += typeBytes;
           sb.append(seg.get(JAVA_DOUBLE_UNALIGNED, offsetBytes)).append(LS);
           offsetBytes += typeBytes;
-        } else if (sketchType == FLOATS_SKETCH) {
+        } else if (sketchType == KLL_FLOATS_SKETCH) {
           sb.append(seg.get(JAVA_FLOAT_UNALIGNED, offsetBytes)).append(LS);
           offsetBytes += typeBytes;
           sb.append(seg.get(JAVA_FLOAT_UNALIGNED, offsetBytes)).append(LS);
           offsetBytes += typeBytes;
-        } else if (sketchType == LONGS_SKETCH) {
+        } else if (sketchType == KLL_LONGS_SKETCH) {
           sb.append(seg.get(JAVA_LONG_UNALIGNED, offsetBytes)).append(LS);
           offsetBytes += typeBytes;
           sb.append(seg.get(JAVA_LONG_UNALIGNED, offsetBytes)).append(LS);
           offsetBytes += typeBytes;
         } else { //ITEMS_SKETCH
-          sb.append("<<>>").append(LS);
+          sb.append("<<>>").append(LS);
         }
 
         sb.append("ALL DATA (including free space)").append(LS);
         final int itemsSpace = (sketchBytes - offsetBytes) / typeBytes;
-        if (sketchType == DOUBLES_SKETCH) {
+        if (sketchType == KLL_DOUBLES_SKETCH) {
           for (int i = 0; i < itemsSpace; i++) {
             sb.append(i + ", " + seg.get(JAVA_DOUBLE_UNALIGNED, offsetBytes)).append(LS);
             offsetBytes += typeBytes;
           }
-        } else if (sketchType == FLOATS_SKETCH) {
+        } else if (sketchType == KLL_FLOATS_SKETCH) {
           for (int i = 0; i < itemsSpace; i++) {
             sb.append(seg.get(JAVA_FLOAT_UNALIGNED, offsetBytes)).append(LS);
             offsetBytes += typeBytes;
           }
-        } else if (sketchType == LONGS_SKETCH) {
+        } else if (sketchType == KLL_LONGS_SKETCH) {
           for (int i = 0; i < itemsSpace; i++) {
             sb.append(seg.get(JAVA_LONG_UNALIGNED, offsetBytes)).append(LS);
             offsetBytes += typeBytes;
           }
         } else { //ITEMS_SKETCH
-          sb.append("<<>>").append(LS);
+          sb.append("<<>>").append(LS);
         }
 
       } else if (myStructure == COMPACT_FULL) {
@@ -343,17 +343,17 @@ static  String toString(final MemorySegment seg, final SketchType sketchType,
         sb.append(" (Top level of Levels Array is absent in MemorySegment)").append(LS);
 
         sb.append("MIN/MAX:").append(LS);
-        if (sketchType == DOUBLES_SKETCH) {
+        if (sketchType == KLL_DOUBLES_SKETCH) {
           sb.append(seg.get(JAVA_DOUBLE_UNALIGNED, offsetBytes)).append(LS);
           offsetBytes += typeBytes;
           sb.append(seg.get(JAVA_DOUBLE_UNALIGNED, offsetBytes)).append(LS);
           offsetBytes += typeBytes;
-        } else if (sketchType == FLOATS_SKETCH) {
+        } else if (sketchType == KLL_FLOATS_SKETCH) {
           sb.append(seg.get(JAVA_FLOAT_UNALIGNED, offsetBytes)).append(LS);
           offsetBytes += typeBytes;
           sb.append(seg.get(JAVA_FLOAT_UNALIGNED, offsetBytes)).append(LS);
           offsetBytes += typeBytes;
-        } else if (sketchType == LONGS_SKETCH) {
+        } else if (sketchType == KLL_LONGS_SKETCH) {
           sb.append(seg.get(JAVA_LONG_UNALIGNED, offsetBytes)).append(LS);
           offsetBytes += typeBytes;
           sb.append(seg.get(JAVA_LONG_UNALIGNED, offsetBytes)).append(LS);
@@ -367,17 +367,17 @@ static  String toString(final MemorySegment seg, final SketchType sketchType,
 
         sb.append("RETAINED DATA").append(LS);
         final int itemSpace = (sketchBytes - offsetBytes) / (typeBytes == 0 ? 1 : typeBytes);
-        if (sketchType == DOUBLES_SKETCH) {
+        if (sketchType == KLL_DOUBLES_SKETCH) {
           for (int i = 0; i < itemSpace; i++) {
             sb.append(i + ", " + seg.get(JAVA_DOUBLE_UNALIGNED, offsetBytes)).append(LS);
             offsetBytes += typeBytes;
           }
-        } else if (sketchType == FLOATS_SKETCH) {
+        } else if (sketchType == KLL_FLOATS_SKETCH) {
           for (int i = 0; i < itemSpace; i++) {
             sb.append(i + ", " + seg.get(JAVA_FLOAT_UNALIGNED, offsetBytes)).append(LS);
             offsetBytes += typeBytes;
           }
-        } else if (sketchType == LONGS_SKETCH) {
+        } else if (sketchType == KLL_LONGS_SKETCH) {
           for (int i = 0; i < itemSpace; i++) {
             sb.append(i + ", " + seg.get(JAVA_LONG_UNALIGNED, offsetBytes)).append(LS);
             offsetBytes += typeBytes;
@@ -392,11 +392,11 @@ static  String toString(final MemorySegment seg, final SketchType sketchType,
       } else if (myStructure == COMPACT_SINGLE) {
 
           sb.append("SINGLE ITEM DATUM: "); //no LS
-          if (sketchType == DOUBLES_SKETCH) {
+          if (sketchType == KLL_DOUBLES_SKETCH) {
             sb.append(seg.get(JAVA_DOUBLE_UNALIGNED, DATA_START_ADR_SINGLE_ITEM)).append(LS);
-          } else if (sketchType == FLOATS_SKETCH) {
+          } else if (sketchType == KLL_FLOATS_SKETCH) {
             sb.append(seg.get(JAVA_FLOAT_UNALIGNED, DATA_START_ADR_SINGLE_ITEM)).append(LS);
-          } else if (sketchType == LONGS_SKETCH) {
+          } else if (sketchType == KLL_LONGS_SKETCH) {
             sb.append(seg.get(JAVA_LONG_UNALIGNED, DATA_START_ADR_SINGLE_ITEM)).append(LS);
           } else { //ITEMS_SKETCH
             sb.append(serDe.deserializeFromMemorySegment(seg, DATA_START_ADR_SINGLE_ITEM, 1)[0]).append(LS);
diff --git a/src/main/java/org/apache/datasketches/kll/KllSketch.java b/src/main/java/org/apache/datasketches/kll/KllSketch.java
index fab808a3e..d25176871 100644
--- a/src/main/java/org/apache/datasketches/kll/KllSketch.java
+++ b/src/main/java/org/apache/datasketches/kll/KllSketch.java
@@ -32,10 +32,10 @@
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_FULL;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_SINGLE;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.UPDATABLE;
-import static org.apache.datasketches.kll.KllSketch.SketchType.DOUBLES_SKETCH;
-import static org.apache.datasketches.kll.KllSketch.SketchType.FLOATS_SKETCH;
-import static org.apache.datasketches.kll.KllSketch.SketchType.ITEMS_SKETCH;
-import static org.apache.datasketches.kll.KllSketch.SketchType.LONGS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_DOUBLES_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_FLOATS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_ITEMS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_LONGS_SKETCH;
 
 import java.lang.foreign.MemorySegment;
 import java.util.Arrays;
@@ -170,7 +170,7 @@ public static int getKFromEpsilon(final double epsilon, final boolean pmf) {
    */
   public static int getMaxSerializedSizeBytes(final int k, final long n,
       final SketchType sketchType, final boolean updatableFormat) {
-    if (sketchType == ITEMS_SKETCH) { throw new SketchesArgumentException(UNSUPPORTED_MSG); }
+    if (sketchType == KLL_ITEMS_SKETCH) { throw new SketchesArgumentException(UNSUPPORTED_MSG); }
     final KllHelper.GrowthStats gStats =
         KllHelper.getGrowthSchemeForGivenN(k, DEFAULT_M, n, sketchType, false);
     return updatableFormat ? gStats.updatableBytes : gStats.compactBytes;
@@ -292,7 +292,7 @@ public final String toString() {
    * @return serialized size in bytes given a SketchStructure.
    */
   final int currentSerializedSizeBytes(final boolean updatable) {
-    final boolean myUpdatable = sketchType == ITEMS_SKETCH ? false : updatable;
+    final boolean myUpdatable = sketchType == KLL_ITEMS_SKETCH ? false : updatable;
     final long srcN = getN();
     final SketchStructure tgtStructure;
     if (myUpdatable) { tgtStructure = UPDATABLE; }
@@ -440,13 +440,13 @@ final boolean isCompactSingleItem() {
     return hasMemorySegment() && (sketchStructure == COMPACT_SINGLE) && (getN() == 1);
   }
 
-  boolean isDoublesSketch() { return sketchType == DOUBLES_SKETCH; }
+  boolean isKllDoublesSketch() { return sketchType == KLL_DOUBLES_SKETCH; }
 
-  boolean isFloatsSketch() { return sketchType == FLOATS_SKETCH; }
+  boolean isKllFloatsSketch() { return sketchType == KLL_FLOATS_SKETCH; }
 
-  boolean isLongsSketch() { return sketchType == LONGS_SKETCH; }
+  boolean isKllLongsSketch() { return sketchType == KLL_LONGS_SKETCH; }
 
-  boolean isItemsSketch() { return sketchType == ITEMS_SKETCH; }
+  boolean isKllItemsSketch() { return sketchType == KLL_ITEMS_SKETCH; }
 
   abstract boolean isLevelZeroSorted();
 
@@ -491,19 +491,19 @@ public enum SketchType {
     /**
      * KllDoublesSketch
      */
-    DOUBLES_SKETCH(Double.BYTES, "KllDoublesSketch"),
+    KLL_DOUBLES_SKETCH(Double.BYTES, "KllDoublesSketch"),
     /**
      * KllFloatsSketch
      */
-    FLOATS_SKETCH(Float.BYTES, "KllFloatsSketch"),
+    KLL_FLOATS_SKETCH(Float.BYTES, "KllFloatsSketch"),
     /**
      * KllItemsSketch
      */
-    ITEMS_SKETCH(0, "KllItemsSketch"),
+    KLL_ITEMS_SKETCH(0, "KllItemsSketch"),
     /**
      * KllDoublesSketch
      */
-    LONGS_SKETCH(Long.BYTES, "KllLongsSketch");
+    KLL_LONGS_SKETCH(Long.BYTES, "KllLongsSketch");
 
     private final int typeBytes;
     private final String name;
diff --git a/src/test/java/org/apache/datasketches/frequencies/FrequentItemsSketchCrossLanguageTest.java b/src/test/java/org/apache/datasketches/frequencies/FrequentItemsSketchCrossLanguageTest.java
index 7d1535daf..109d468be 100644
--- a/src/test/java/org/apache/datasketches/frequencies/FrequentItemsSketchCrossLanguageTest.java
+++ b/src/test/java/org/apache/datasketches/frequencies/FrequentItemsSketchCrossLanguageTest.java
@@ -32,8 +32,8 @@
 import java.nio.file.Files;
 
 import org.apache.datasketches.common.ArrayOfStringsSerDe;
-import org.apache.datasketches.frequencies.ItemsSketch;
-import org.apache.datasketches.frequencies.LongsSketch;
+import org.apache.datasketches.frequencies.FrequentItemsSketch;
+import org.apache.datasketches.frequencies.FrequentLongsSketch;
 import org.testng.annotations.Test;
 
 /**
@@ -46,7 +46,7 @@ public class FrequentItemsSketchCrossLanguageTest {
   public void generateBinariesForCompatibilityTestingLongsSketch() throws IOException {
     final int[] nArr = {0, 1, 10, 100, 1000, 10_000, 100_000, 1_000_000};
     for (final int n: nArr) {
-      final LongsSketch sk = new LongsSketch(64);
+      final FrequentLongsSketch sk = new FrequentLongsSketch(64);
       for (int i = 1; i <= n; i++) {
         sk.update(i);
       }
@@ -61,7 +61,7 @@ public void generateBinariesForCompatibilityTestingLongsSketch() throws IOExcept
   public void generateBinariesForCompatibilityTestingStringsSketch() throws IOException {
     final int[] nArr = {0, 1, 10, 100, 1000, 10_000, 100_000, 1_000_000};
     for (final int n: nArr) {
-      final ItemsSketch sk = new ItemsSketch<>(64);
+      final FrequentItemsSketch sk = new FrequentItemsSketch<>(64);
       for (int i = 1; i <= n; i++) {
         sk.update(Integer.toString(i));
       }
@@ -75,7 +75,7 @@ public void generateBinariesForCompatibilityTestingStringsSketch() throws IOExce
 
   @Test(groups = {GENERATE_JAVA_FILES})
   public void generateBinariesForCompatibilityTestingStringsSketchAscii() throws IOException {
-    final ItemsSketch sk = new ItemsSketch<>(64);
+    final FrequentItemsSketch sk = new FrequentItemsSketch<>(64);
     sk.update("aaaaaaaaaaaaaaaaaaaaaaaaaaaaa", 1);
     sk.update("bbbbbbbbbbbbbbbbbbbbbbbbbbbbb", 2);
     sk.update("ccccccccccccccccccccccccccccc", 3);
@@ -86,7 +86,7 @@ public void generateBinariesForCompatibilityTestingStringsSketchAscii() throws I
 
   @Test(groups = {GENERATE_JAVA_FILES})
   public void generateBinariesForCompatibilityTestingStringsSketchUtf8() throws IOException {
-    final ItemsSketch sk = new ItemsSketch<>(64);
+    final FrequentItemsSketch sk = new FrequentItemsSketch<>(64);
     sk.update("абвгд", 1);
     sk.update("еёжзи", 2);
     sk.update("йклмн", 3);
@@ -103,7 +103,7 @@ public void longs() throws IOException {
     final int[] nArr = {0, 1, 10, 100, 1000, 10000, 100000, 1000000};
     for (final int n: nArr) {
       final byte[] bytes = Files.readAllBytes(cppPath.resolve("frequent_long_n" + n + "_cpp.sk"));
-      final LongsSketch sketch = LongsSketch.getInstance(MemorySegment.ofArray(bytes));
+      final FrequentLongsSketch sketch = FrequentLongsSketch.getInstance(MemorySegment.ofArray(bytes));
       assertTrue(n == 0 ? sketch.isEmpty() : !sketch.isEmpty());
       if (n > 10) {
         assertTrue(sketch.getMaximumError() > 0);
@@ -119,7 +119,7 @@ public void strings() throws IOException {
     final int[] nArr = {0, 1, 10, 100, 1000, 10000, 100000, 1000000};
     for (final int n: nArr) {
       final byte[] bytes = Files.readAllBytes(cppPath.resolve("frequent_string_n" + n + "_cpp.sk"));
-      final ItemsSketch sketch = ItemsSketch.getInstance(MemorySegment.ofArray(bytes), new ArrayOfStringsSerDe());
+      final FrequentItemsSketch sketch = FrequentItemsSketch.getInstance(MemorySegment.ofArray(bytes), new ArrayOfStringsSerDe());
       assertTrue(n == 0 ? sketch.isEmpty() : !sketch.isEmpty());
       if (n > 10) {
         assertTrue(sketch.getMaximumError() > 0);
@@ -133,7 +133,7 @@ public void strings() throws IOException {
   @Test(groups = {CHECK_CPP_FILES})
   public void stringsAscii() throws IOException {
     final byte[] bytes = Files.readAllBytes(cppPath.resolve("frequent_string_ascii_cpp.sk"));
-    final ItemsSketch sketch = ItemsSketch.getInstance(MemorySegment.ofArray(bytes), new ArrayOfStringsSerDe());
+    final FrequentItemsSketch sketch = FrequentItemsSketch.getInstance(MemorySegment.ofArray(bytes), new ArrayOfStringsSerDe());
     assertFalse(sketch.isEmpty());
     assertEquals(sketch.getMaximumError(), 0);
     assertEquals(sketch.getStreamLength(), 10);
@@ -146,7 +146,7 @@ public void stringsAscii() throws IOException {
   @Test(groups = {CHECK_CPP_FILES})
   public void stringsUtf8() throws IOException {
     final byte[] bytes = Files.readAllBytes(cppPath.resolve("frequent_string_utf8_cpp.sk"));
-    final ItemsSketch sketch = ItemsSketch.getInstance(MemorySegment.ofArray(bytes), new ArrayOfStringsSerDe());
+    final FrequentItemsSketch sketch = FrequentItemsSketch.getInstance(MemorySegment.ofArray(bytes), new ArrayOfStringsSerDe());
     assertFalse(sketch.isEmpty());
     assertEquals(sketch.getMaximumError(), 0);
     assertEquals(sketch.getStreamLength(), 28);
diff --git a/src/test/java/org/apache/datasketches/frequencies/ItemsSketchTest.java b/src/test/java/org/apache/datasketches/frequencies/ItemsSketchTest.java
index 77fb3579d..d77933444 100644
--- a/src/test/java/org/apache/datasketches/frequencies/ItemsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/frequencies/ItemsSketchTest.java
@@ -41,15 +41,15 @@
 import org.apache.datasketches.common.ArrayOfUtf16StringsSerDe;
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.frequencies.ErrorType;
-import org.apache.datasketches.frequencies.ItemsSketch;
+import org.apache.datasketches.frequencies.FrequentItemsSketch;
 import org.apache.datasketches.frequencies.ReversePurgeItemHashMap;
-import org.apache.datasketches.frequencies.ItemsSketch.Row;
+import org.apache.datasketches.frequencies.FrequentItemsSketch.Row;
 
 public class ItemsSketchTest {
 
   @Test
   public void empty() {
-    final ItemsSketch sketch = new ItemsSketch<>(1 << LG_MIN_MAP_SIZE);
+    final FrequentItemsSketch sketch = new FrequentItemsSketch<>(1 << LG_MIN_MAP_SIZE);
     Assert.assertTrue(sketch.isEmpty());
     Assert.assertEquals(sketch.getNumActiveItems(), 0);
     Assert.assertEquals(sketch.getStreamLength(), 0);
@@ -59,7 +59,7 @@ public void empty() {
 
   @Test
   public void nullInput() {
-    final ItemsSketch sketch = new ItemsSketch<>(1 << LG_MIN_MAP_SIZE);
+    final FrequentItemsSketch sketch = new FrequentItemsSketch<>(1 << LG_MIN_MAP_SIZE);
     sketch.update(null);
     Assert.assertTrue(sketch.isEmpty());
     Assert.assertEquals(sketch.getNumActiveItems(), 0);
@@ -70,7 +70,7 @@ public void nullInput() {
 
   @Test
   public void oneItem() {
-    final ItemsSketch sketch = new ItemsSketch<>(1 << LG_MIN_MAP_SIZE);
+    final FrequentItemsSketch sketch = new FrequentItemsSketch<>(1 << LG_MIN_MAP_SIZE);
     sketch.update("a");
     Assert.assertFalse(sketch.isEmpty());
     Assert.assertEquals(sketch.getNumActiveItems(), 1);
@@ -81,7 +81,7 @@ public void oneItem() {
 
   @Test
   public void severalItems() {
-    final ItemsSketch sketch = new ItemsSketch<>(1 << LG_MIN_MAP_SIZE);
+    final FrequentItemsSketch sketch = new FrequentItemsSketch<>(1 << LG_MIN_MAP_SIZE);
     sketch.update("a");
     sketch.update("b");
     sketch.update("c");
@@ -97,7 +97,7 @@ public void severalItems() {
     Assert.assertEquals(sketch.getEstimate("c"), 2);
     Assert.assertEquals(sketch.getEstimate("d"), 1);
 
-    ItemsSketch.Row[] items = sketch.getFrequentItems(ErrorType.NO_FALSE_POSITIVES);
+    FrequentItemsSketch.Row[] items = sketch.getFrequentItems(ErrorType.NO_FALSE_POSITIVES);
     Assert.assertEquals(items.length, 4);
 
     items = sketch.getFrequentItems(3, ErrorType.NO_FALSE_POSITIVES);
@@ -112,7 +112,7 @@ public void severalItems() {
 
   @Test
   public void estimationMode() {
-    final ItemsSketch sketch = new ItemsSketch<>(1 << LG_MIN_MAP_SIZE);
+    final FrequentItemsSketch sketch = new FrequentItemsSketch<>(1 << LG_MIN_MAP_SIZE);
     sketch.update(1, 10);
     sketch.update(2);
     sketch.update(3);
@@ -130,12 +130,12 @@ public void estimationMode() {
     Assert.assertEquals(sketch.getStreamLength(), 35);
 
     {
-      final ItemsSketch.Row[] items =
+      final FrequentItemsSketch.Row[] items =
           sketch.getFrequentItems(ErrorType.NO_FALSE_POSITIVES);
       Assert.assertEquals(items.length, 2);
       // only 2 items (1 and 7) should have counts more than 1
       int count = 0;
-      for (final ItemsSketch.Row item: items) {
+      for (final FrequentItemsSketch.Row item: items) {
         if (item.getLowerBound() > 1) {
           count++;
         }
@@ -144,12 +144,12 @@ public void estimationMode() {
     }
 
     {
-      final ItemsSketch.Row[] items =
+      final FrequentItemsSketch.Row[] items =
           sketch.getFrequentItems(ErrorType.NO_FALSE_NEGATIVES);
       Assert.assertTrue(items.length >= 2);
       // only 2 items (1 and 7) should have counts more than 1
       int count = 0;
-      for (final ItemsSketch.Row item: items) {
+      for (final FrequentItemsSketch.Row item: items) {
         if (item.getLowerBound() > 5) {
           count++;
         }
@@ -160,10 +160,10 @@ public void estimationMode() {
 
   @Test
   public void serializeStringDeserializeEmpty() {
-    final ItemsSketch sketch1 = new ItemsSketch<>(1 << LG_MIN_MAP_SIZE);
+    final FrequentItemsSketch sketch1 = new FrequentItemsSketch<>(1 << LG_MIN_MAP_SIZE);
     final byte[] bytes = sketch1.toByteArray(new ArrayOfStringsSerDe());
-    final ItemsSketch sketch2 =
-        ItemsSketch.getInstance(MemorySegment.ofArray(bytes), new ArrayOfStringsSerDe());
+    final FrequentItemsSketch sketch2 =
+        FrequentItemsSketch.getInstance(MemorySegment.ofArray(bytes), new ArrayOfStringsSerDe());
     Assert.assertTrue(sketch2.isEmpty());
     Assert.assertEquals(sketch2.getNumActiveItems(), 0);
     Assert.assertEquals(sketch2.getStreamLength(), 0);
@@ -171,15 +171,15 @@ public void serializeStringDeserializeEmpty() {
 
   @Test
   public void serializeDeserializeUft8Strings() {
-    final ItemsSketch sketch1 = new ItemsSketch<>(1 << LG_MIN_MAP_SIZE);
+    final FrequentItemsSketch sketch1 = new FrequentItemsSketch<>(1 << LG_MIN_MAP_SIZE);
     sketch1.update("aaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
     sketch1.update("bbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
     sketch1.update("ccccccccccccccccccccccccccccc");
     sketch1.update("ddddddddddddddddddddddddddddd");
 
     final byte[] bytes = sketch1.toByteArray(new ArrayOfStringsSerDe());
-    final ItemsSketch sketch2 =
-        ItemsSketch.getInstance(MemorySegment.ofArray(bytes), new ArrayOfStringsSerDe());
+    final FrequentItemsSketch sketch2 =
+        FrequentItemsSketch.getInstance(MemorySegment.ofArray(bytes), new ArrayOfStringsSerDe());
     sketch2.update("bbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
     sketch2.update("ccccccccccccccccccccccccccccc");
     sketch2.update("bbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -195,15 +195,15 @@ public void serializeDeserializeUft8Strings() {
 
   @Test
   public void serializeDeserializeUtf16Strings() {
-    final ItemsSketch sketch1 = new ItemsSketch<>(1 << LG_MIN_MAP_SIZE);
+    final FrequentItemsSketch sketch1 = new FrequentItemsSketch<>(1 << LG_MIN_MAP_SIZE);
     sketch1.update("aaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
     sketch1.update("bbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
     sketch1.update("ccccccccccccccccccccccccccccc");
     sketch1.update("ddddddddddddddddddddddddddddd");
 
     final byte[] bytes = sketch1.toByteArray(new ArrayOfUtf16StringsSerDe());
-    final ItemsSketch sketch2 =
-        ItemsSketch.getInstance(MemorySegment.ofArray(bytes), new ArrayOfUtf16StringsSerDe());
+    final FrequentItemsSketch sketch2 =
+        FrequentItemsSketch.getInstance(MemorySegment.ofArray(bytes), new ArrayOfUtf16StringsSerDe());
     sketch2.update("bbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
     sketch2.update("ccccccccccccccccccccccccccccc");
     sketch2.update("bbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
@@ -219,7 +219,7 @@ public void serializeDeserializeUtf16Strings() {
 
   @Test
   public void forceResize() {
-    final ItemsSketch sketch1 = new ItemsSketch<>(2 << LG_MIN_MAP_SIZE);
+    final FrequentItemsSketch sketch1 = new FrequentItemsSketch<>(2 << LG_MIN_MAP_SIZE);
     for (int i=0; i<32; i++) {
       sketch1.update(Integer.toString(i), i*i);
     }
@@ -227,14 +227,14 @@ public void forceResize() {
 
   @Test
   public void getRowHeader() {
-    final String header = ItemsSketch.Row.getRowHeader();
+    final String header = FrequentItemsSketch.Row.getRowHeader();
     Assert.assertNotNull(header);
     Assert.assertTrue(header.length() > 0);
   }
 
   @Test
   public void serializeLongDeserialize() {
-    final ItemsSketch sketch1 = new ItemsSketch<>(1 << LG_MIN_MAP_SIZE);
+    final FrequentItemsSketch sketch1 = new FrequentItemsSketch<>(1 << LG_MIN_MAP_SIZE);
     sketch1.update(1L);
     sketch1.update(2L);
     sketch1.update(3L);
@@ -244,8 +244,8 @@ public void serializeLongDeserialize() {
     println(s);
 
     final byte[] bytes = sketch1.toByteArray(new ArrayOfLongsSerDe());
-    final ItemsSketch sketch2 =
-        ItemsSketch.getInstance(MemorySegment.ofArray(bytes), new ArrayOfLongsSerDe());
+    final FrequentItemsSketch sketch2 =
+        FrequentItemsSketch.getInstance(MemorySegment.ofArray(bytes), new ArrayOfLongsSerDe());
     sketch2.update(2L);
     sketch2.update(3L);
     sketch2.update(2L);
@@ -261,13 +261,13 @@ public void serializeLongDeserialize() {
 
   @Test
   public void mergeExact() {
-    final ItemsSketch sketch1 = new ItemsSketch<>(1 << LG_MIN_MAP_SIZE);
+    final FrequentItemsSketch sketch1 = new FrequentItemsSketch<>(1 << LG_MIN_MAP_SIZE);
     sketch1.update("a");
     sketch1.update("b");
     sketch1.update("c");
     sketch1.update("d");
 
-    final ItemsSketch sketch2 = new ItemsSketch<>(1 << LG_MIN_MAP_SIZE);
+    final FrequentItemsSketch sketch2 = new FrequentItemsSketch<>(1 << LG_MIN_MAP_SIZE);
     sketch2.update("b");
     sketch2.update("c");
     sketch2.update("b");
@@ -292,15 +292,15 @@ public void checkNullMapReturns() {
   @SuppressWarnings("unlikely-arg-type")
   @Test
   public void checkMisc() {
-    final ItemsSketch sk1 = new ItemsSketch<>(1 << LG_MIN_MAP_SIZE);
+    final FrequentItemsSketch sk1 = new FrequentItemsSketch<>(1 << LG_MIN_MAP_SIZE);
     Assert.assertEquals(sk1.getCurrentMapCapacity(), 6);
     Assert.assertEquals(sk1.getEstimate(Long.valueOf(1)), 0);
-    final ItemsSketch sk2 = new ItemsSketch<>(8);
+    final FrequentItemsSketch sk2 = new FrequentItemsSketch<>(8);
     Assert.assertEquals(sk1.merge(sk2), sk1 );
     Assert.assertEquals(sk1.merge(null), sk1);
     sk1.update(Long.valueOf(1));
-    final ItemsSketch.Row[] rows = sk1.getFrequentItems(ErrorType.NO_FALSE_NEGATIVES);
-    final ItemsSketch.Row row = rows[0];
+    final FrequentItemsSketch.Row[] rows = sk1.getFrequentItems(ErrorType.NO_FALSE_NEGATIVES);
+    final FrequentItemsSketch.Row row = rows[0];
     Assert.assertTrue(row.hashCode() != 0);
     Assert.assertTrue(row.equals(row));
     Assert.assertFalse(row.equals(sk1));
@@ -309,20 +309,20 @@ public void checkMisc() {
     Assert.assertEquals(row.getUpperBound(), 1);
     final String s = row.toString();
     println(s);
-    final ItemsSketch.Row nullRow = null; //check equals(null)
+    final FrequentItemsSketch.Row nullRow = null; //check equals(null)
     Assert.assertFalse(row.equals(nullRow));
   }
 
   @Test
   public void checkToString() {
-    final ItemsSketch sk = new ItemsSketch<>(1 << LG_MIN_MAP_SIZE);
+    final FrequentItemsSketch sk = new FrequentItemsSketch<>(1 << LG_MIN_MAP_SIZE);
     sk.update(Long.valueOf(1));
-    println(ItemsSketch.toString(sk.toByteArray(new ArrayOfLongsSerDe())));
+    println(FrequentItemsSketch.toString(sk.toByteArray(new ArrayOfLongsSerDe())));
   }
 
   @Test
   public void checkGetFrequentItems1() {
-    final ItemsSketch fis = new ItemsSketch<>(1 << LG_MIN_MAP_SIZE);
+    final FrequentItemsSketch fis = new FrequentItemsSketch<>(1 << LG_MIN_MAP_SIZE);
     fis.update(1L);
     final Row[] rowArr = fis.getFrequentItems(ErrorType.NO_FALSE_POSITIVES);
     final Row row = rowArr[0];
@@ -339,13 +339,13 @@ public void checkGetFrequentItems1() {
 
   @Test(expectedExceptions = SketchesArgumentException.class)
   public void checkUpdateException() {
-    final ItemsSketch sk1 = new ItemsSketch<>(1 << LG_MIN_MAP_SIZE);
+    final FrequentItemsSketch sk1 = new FrequentItemsSketch<>(1 << LG_MIN_MAP_SIZE);
     sk1.update(Long.valueOf(1), -1);
   }
 
   @Test
   public void checkMemorySegmentExceptions() {
-    final ItemsSketch sk1 = new ItemsSketch<>(1 << LG_MIN_MAP_SIZE);
+    final FrequentItemsSketch sk1 = new FrequentItemsSketch<>(1 << LG_MIN_MAP_SIZE);
     sk1.update(Long.valueOf(1), 1);
     final ArrayOfLongsSerDe serDe = new ArrayOfLongsSerDe();
     final byte[] byteArr = sk1.toByteArray(serDe);
@@ -369,7 +369,7 @@ public void checkMemorySegmentExceptions() {
 
   @Test
   public void oneItemUtf8() {
-    final ItemsSketch sketch1 = new ItemsSketch<>(1 << LG_MIN_MAP_SIZE);
+    final FrequentItemsSketch sketch1 = new FrequentItemsSketch<>(1 << LG_MIN_MAP_SIZE);
     sketch1.update("\u5fb5");
     Assert.assertFalse(sketch1.isEmpty());
     Assert.assertEquals(sketch1.getNumActiveItems(), 1);
@@ -377,8 +377,8 @@ public void oneItemUtf8() {
     Assert.assertEquals(sketch1.getEstimate("\u5fb5"), 1);
 
     final byte[] bytes = sketch1.toByteArray(new ArrayOfStringsSerDe());
-    final ItemsSketch sketch2 =
-        ItemsSketch.getInstance(MemorySegment.ofArray(bytes), new ArrayOfStringsSerDe());
+    final FrequentItemsSketch sketch2 =
+        FrequentItemsSketch.getInstance(MemorySegment.ofArray(bytes), new ArrayOfStringsSerDe());
     Assert.assertFalse(sketch2.isEmpty());
     Assert.assertEquals(sketch2.getNumActiveItems(), 1);
     Assert.assertEquals(sketch2.getStreamLength(), 1);
@@ -387,16 +387,16 @@ public void oneItemUtf8() {
 
   @Test
   public void checkGetEpsilon() {
-    assertEquals(ItemsSketch.getEpsilon(1024), 3.5 / 1024, 0.0);
+    assertEquals(FrequentItemsSketch.getEpsilon(1024), 3.5 / 1024, 0.0);
     try {
-      ItemsSketch.getEpsilon(1000);
+      FrequentItemsSketch.getEpsilon(1000);
     } catch (final SketchesArgumentException e) { }
   }
 
   @Test
   public void checkGetAprioriError() {
     final double eps = 3.5 / 1024;
-    assertEquals(ItemsSketch.getAprioriError(1024, 10_000), eps * 10_000);
+    assertEquals(FrequentItemsSketch.getAprioriError(1024, 10_000), eps * 10_000);
   }
 
   @Test
@@ -410,7 +410,7 @@ private static void tryBadSeg(final MemorySegment seg, final int byteOffset, fin
     final ArrayOfLongsSerDe serDe = new ArrayOfLongsSerDe();
     try {
       seg.set(JAVA_BYTE, byteOffset, (byte) byteValue); //Corrupt
-      ItemsSketch.getInstance(seg, serDe);
+      FrequentItemsSketch.getInstance(seg, serDe);
       fail();
     } catch (final SketchesArgumentException e) {
       //expected
diff --git a/src/test/java/org/apache/datasketches/frequencies/LongsSketchTest.java b/src/test/java/org/apache/datasketches/frequencies/LongsSketchTest.java
index 423e8a96c..109ad8cd5 100644
--- a/src/test/java/org/apache/datasketches/frequencies/LongsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/frequencies/LongsSketchTest.java
@@ -41,10 +41,10 @@
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.Util;
 import org.apache.datasketches.frequencies.ErrorType;
-import org.apache.datasketches.frequencies.LongsSketch;
+import org.apache.datasketches.frequencies.FrequentLongsSketch;
 import org.apache.datasketches.frequencies.PreambleUtil;
 import org.apache.datasketches.frequencies.ReversePurgeLongHashMap;
-import org.apache.datasketches.frequencies.LongsSketch.Row;
+import org.apache.datasketches.frequencies.FrequentLongsSketch.Row;
 
 public class LongsSketchTest {
 
@@ -66,8 +66,8 @@ public void hashMapSerialTest() {
 
   @Test
   public void frequentItemsStringSerialTest() {
-    final LongsSketch sketch = new LongsSketch(8);
-    final LongsSketch sketch2 = new LongsSketch(128);
+    final FrequentLongsSketch sketch = new FrequentLongsSketch(8);
+    final FrequentLongsSketch sketch2 = new FrequentLongsSketch(128);
     sketch.update(10, 100);
     sketch.update(10, 100);
     sketch.update(15, 3443);
@@ -75,7 +75,7 @@ public void frequentItemsStringSerialTest() {
     sketch.update(1000002, 1010230);
 
     final String string0 = sketch.serializeToString();
-    final LongsSketch new_sketch0 = LongsSketch.getInstance(string0);
+    final FrequentLongsSketch new_sketch0 = FrequentLongsSketch.getInstance(string0);
     final String new_string0 = new_sketch0.serializeToString();
     Assert.assertTrue(string0.equals(new_string0));
     Assert.assertTrue(new_sketch0.getMaximumMapCapacity() == sketch.getMaximumMapCapacity());
@@ -102,17 +102,17 @@ public void frequentItemsStringSerialTest() {
     sketch2.update(208, 12902390);
 
     final String string2 = sketch2.serializeToString();
-    final LongsSketch new_sketch2 = LongsSketch.getInstance(string2);
+    final FrequentLongsSketch new_sketch2 = FrequentLongsSketch.getInstance(string2);
     final String new_string2 = new_sketch2.serializeToString();
     Assert.assertTrue(string2.equals(new_string2));
     Assert.assertTrue(new_sketch2.getMaximumMapCapacity() == sketch2.getMaximumMapCapacity());
     Assert.assertTrue(new_sketch2.getCurrentMapCapacity() == sketch2.getCurrentMapCapacity());
     Assert.assertTrue(new_sketch2.getStreamLength() == sketch2.getStreamLength());
 
-    final LongsSketch merged_sketch = sketch.merge(sketch2);
+    final FrequentLongsSketch merged_sketch = sketch.merge(sketch2);
 
     final String string = merged_sketch.serializeToString();
-    final LongsSketch new_sketch = LongsSketch.getInstance(string);
+    final FrequentLongsSketch new_sketch = FrequentLongsSketch.getInstance(string);
     final String new_string = new_sketch.serializeToString();
     Assert.assertTrue(string.equals(new_string));
     Assert.assertTrue(new_sketch.getMaximumMapCapacity() == merged_sketch.getMaximumMapCapacity());
@@ -123,17 +123,17 @@ public void frequentItemsStringSerialTest() {
   @Test
   public void frequentItemsByteSerialTest() {
     //Empty Sketch
-    final LongsSketch sketch = new LongsSketch(16);
+    final FrequentLongsSketch sketch = new FrequentLongsSketch(16);
     final byte[] bytearray0 = sketch.toByteArray();
     final MemorySegment seg0 = MemorySegment.ofArray(bytearray0);
-    final LongsSketch new_sketch0 = LongsSketch.getInstance(seg0);
-    final String str0 = LongsSketch.toString(seg0);
+    final FrequentLongsSketch new_sketch0 = FrequentLongsSketch.getInstance(seg0);
+    final String str0 = FrequentLongsSketch.toString(seg0);
     println(str0);
     final String string0 = sketch.serializeToString();
     final String new_string0 = new_sketch0.serializeToString();
     Assert.assertTrue(string0.equals(new_string0));
 
-    final LongsSketch sketch2 = new LongsSketch(128);
+    final FrequentLongsSketch sketch2 = new FrequentLongsSketch(128);
     sketch.update(10, 100);
     sketch.update(10, 100);
     sketch.update(15, 3443);
@@ -142,8 +142,8 @@ public void frequentItemsByteSerialTest() {
 
     final byte[] bytearray1 = sketch.toByteArray();
     final MemorySegment seg1 = MemorySegment.ofArray(bytearray1);
-    final LongsSketch new_sketch1 = LongsSketch.getInstance(seg1);
-    final String str1 = LongsSketch.toString(bytearray1);
+    final FrequentLongsSketch new_sketch1 = FrequentLongsSketch.getInstance(seg1);
+    final String str1 = FrequentLongsSketch.toString(bytearray1);
     println(str1);
     final String string1 = sketch.serializeToString();
     final String new_string1 = new_sketch1.serializeToString();
@@ -173,7 +173,7 @@ public void frequentItemsByteSerialTest() {
 
     final byte[] bytearray2 = sketch2.toByteArray();
     final MemorySegment seg2 = MemorySegment.ofArray(bytearray2);
-    final LongsSketch new_sketch2 = LongsSketch.getInstance(seg2);
+    final FrequentLongsSketch new_sketch2 = FrequentLongsSketch.getInstance(seg2);
 
     final String string2 = sketch2.serializeToString();
     final String new_string2 = new_sketch2.serializeToString();
@@ -183,11 +183,11 @@ public void frequentItemsByteSerialTest() {
     Assert.assertTrue(new_sketch2.getCurrentMapCapacity() == sketch2.getCurrentMapCapacity());
     Assert.assertTrue(new_sketch2.getStreamLength() == sketch2.getStreamLength());
 
-    final LongsSketch merged_sketch = sketch.merge(sketch2);
+    final FrequentLongsSketch merged_sketch = sketch.merge(sketch2);
 
     final byte[] bytearray = sketch.toByteArray();
     final MemorySegment seg = MemorySegment.ofArray(bytearray);
-    final LongsSketch new_sketch = LongsSketch.getInstance(seg);
+    final FrequentLongsSketch new_sketch = FrequentLongsSketch.getInstance(seg);
 
     final String string = sketch.serializeToString();
     final String new_string = new_sketch.serializeToString();
@@ -200,7 +200,7 @@ public void frequentItemsByteSerialTest() {
 
   @Test
   public void frequentItemsByteResetAndEmptySerialTest() {
-    final LongsSketch sketch = new LongsSketch(16);
+    final FrequentLongsSketch sketch = new FrequentLongsSketch(16);
     sketch.update(10, 100);
     sketch.update(10, 100);
     sketch.update(15, 3443);
@@ -210,7 +210,7 @@ public void frequentItemsByteResetAndEmptySerialTest() {
 
     final byte[] bytearray0 = sketch.toByteArray();
     final MemorySegment seg0 = MemorySegment.ofArray(bytearray0);
-    final LongsSketch new_sketch0 = LongsSketch.getInstance(seg0);
+    final FrequentLongsSketch new_sketch0 = FrequentLongsSketch.getInstance(seg0);
 
     final String string0 = sketch.serializeToString();
     final String new_string0 = new_sketch0.serializeToString();
@@ -222,7 +222,7 @@ public void frequentItemsByteResetAndEmptySerialTest() {
   @Test
   public void checkFreqLongsSegSerDe() {
     final int minSize = 1 << LG_MIN_MAP_SIZE;
-    final LongsSketch sk1 = new LongsSketch(minSize);
+    final FrequentLongsSketch sk1 = new FrequentLongsSketch(minSize);
     sk1.update(10, 100);
     sk1.update(10, 100);
     sk1.update(15, 3443); println(sk1.toString());
@@ -231,7 +231,7 @@ public void checkFreqLongsSegSerDe() {
 
     final byte[] bytearray0 = sk1.toByteArray();
     final MemorySegment seg0 = MemorySegment.ofArray(bytearray0);
-    final LongsSketch sk2 = LongsSketch.getInstance(seg0);
+    final FrequentLongsSketch sk2 = FrequentLongsSketch.getInstance(seg0);
 
     checkEquality(sk1, sk2);
   }
@@ -239,7 +239,7 @@ public void checkFreqLongsSegSerDe() {
   @Test
   public void checkFreqLongsStringSerDe() {
     final int minSize = 1 << LG_MIN_MAP_SIZE;
-    final LongsSketch sk1 = new LongsSketch(minSize);
+    final FrequentLongsSketch sk1 = new FrequentLongsSketch(minSize);
     sk1.update(10, 100);
     sk1.update(10, 100);
     sk1.update(15, 3443);
@@ -247,12 +247,12 @@ public void checkFreqLongsStringSerDe() {
     sk1.update(1000002, 1010230);
 
     final String string1 = sk1.serializeToString();
-    final LongsSketch sk2 = LongsSketch.getInstance(string1);
+    final FrequentLongsSketch sk2 = FrequentLongsSketch.getInstance(string1);
 
     checkEquality(sk1, sk2);
   }
 
-  private static void checkEquality(final LongsSketch sk1, final LongsSketch sk2) {
+  private static void checkEquality(final FrequentLongsSketch sk1, final FrequentLongsSketch sk2) {
     assertEquals(sk1.getNumActiveItems(), sk2.getNumActiveItems());
     assertEquals(sk1.getCurrentMapCapacity(), sk2.getCurrentMapCapacity());
     assertEquals(sk1.getMaximumError(), sk2.getMaximumError());
@@ -284,7 +284,7 @@ private static void checkEquality(final LongsSketch sk1, final LongsSketch sk2)
   @Test
   public void checkFreqLongsSegDeSerExceptions() {
     final int minSize = 1 << LG_MIN_MAP_SIZE;
-    final LongsSketch sk1 = new LongsSketch(minSize);
+    final FrequentLongsSketch sk1 = new FrequentLongsSketch(minSize);
     sk1.update(1L);
 
     final byte[] bytearray0 = sk1.toByteArray();
@@ -307,7 +307,7 @@ public void checkFreqLongsSegDeSerExceptions() {
   private static void tryBadSeg(final MemorySegment seg, final int byteOffset, final int byteValue) {
     try {
       seg.set(JAVA_BYTE, byteOffset, (byte) byteValue); //Corrupt
-      LongsSketch.getInstance(seg);
+      FrequentLongsSketch.getInstance(seg);
       fail();
     } catch (final SketchesArgumentException e) {
       //expected
@@ -327,7 +327,7 @@ public void checkFreqLongsStringDeSerExceptions() {
 
   private static void tryBadString(final String badString) {
     try {
-      LongsSketch.getInstance(badString);
+      FrequentLongsSketch.getInstance(badString);
       fail("Should have thrown SketchesArgumentException");
     } catch (final SketchesArgumentException e) {
       //expected
@@ -340,7 +340,7 @@ public void checkFreqLongs(){
     final int n = 2222;
     final double error_tolerance = 1.0/100;
 
-    final LongsSketch[] sketches = new LongsSketch[numSketches];
+    final FrequentLongsSketch[] sketches = new FrequentLongsSketch[numSketches];
     for (int h = 0; h < numSketches; h++) {
       sketches[h] = newFrequencySketch(error_tolerance);
     }
@@ -378,7 +378,7 @@ public void updateOneTime() {
     //double delta = .01;
     final int numSketches = 1;
     for (int h = 0; h < numSketches; h++) {
-      final LongsSketch sketch = newFrequencySketch(error_tolerance);
+      final FrequentLongsSketch sketch = newFrequencySketch(error_tolerance);
       Assert.assertEquals(sketch.getUpperBound(13L), 0);
       Assert.assertEquals(sketch.getLowerBound(13L), 0);
       Assert.assertEquals(sketch.getMaximumError(), 0);
@@ -391,19 +391,19 @@ public void updateOneTime() {
   @Test(expectedExceptions = SketchesArgumentException.class)
   public void checkGetInstanceMemorySegment() {
     final MemorySegment seg = MemorySegment.ofArray(new byte[4]);
-    LongsSketch.getInstance(seg);
+    FrequentLongsSketch.getInstance(seg);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
   public void checkGetInstanceString() {
     final String s = "";
-    LongsSketch.getInstance(s);
+    FrequentLongsSketch.getInstance(s);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
   public void checkUpdateNegative() {
     final int minSize = 1 << LG_MIN_MAP_SIZE;
-    final LongsSketch fls = new LongsSketch(minSize);
+    final FrequentLongsSketch fls = new FrequentLongsSketch(minSize);
     fls.update(1, 0);
     fls.update(1, -1);
   }
@@ -412,7 +412,7 @@ public void checkUpdateNegative() {
   @Test
   public void checkGetFrequentItems1() {
     final int minSize = 1 << LG_MIN_MAP_SIZE;
-    final LongsSketch fis = new LongsSketch(minSize);
+    final FrequentLongsSketch fis = new FrequentLongsSketch(minSize);
     fis.update(1);
     final Row[] rowArr = fis.getFrequentItems(ErrorType.NO_FALSE_POSITIVES);
     final Row row = rowArr[0];
@@ -434,7 +434,7 @@ public void checkGetFrequentItems1() {
   @Test
   public void checkGetStorageBytes() {
     final int minSize = 1 << LG_MIN_MAP_SIZE;
-    final LongsSketch fls = new LongsSketch(minSize);
+    final FrequentLongsSketch fls = new FrequentLongsSketch(minSize);
     assertEquals(fls.toByteArray().length, fls.getStorageBytes());
     fls.update(1);
     assertEquals(fls.toByteArray().length, fls.getStorageBytes());
@@ -443,7 +443,7 @@ public void checkGetStorageBytes() {
   @Test
   public void checkDeSerFromStringArray() {
     final int minSize = 1 << LG_MIN_MAP_SIZE;
-    final LongsSketch fls = new LongsSketch(minSize);
+    final FrequentLongsSketch fls = new FrequentLongsSketch(minSize);
     String ser = fls.serializeToString();
     println(ser);
     fls.update(1);
@@ -454,12 +454,12 @@ public void checkDeSerFromStringArray() {
   @Test
   public void checkMerge() {
     final int minSize = 1 << LG_MIN_MAP_SIZE;
-    final LongsSketch fls1 = new LongsSketch(minSize);
-    LongsSketch fls2 = null;
-    LongsSketch fle = fls1.merge(fls2);
+    final FrequentLongsSketch fls1 = new FrequentLongsSketch(minSize);
+    FrequentLongsSketch fls2 = null;
+    FrequentLongsSketch fle = fls1.merge(fls2);
     assertTrue(fle.isEmpty());
 
-    fls2 = new LongsSketch(minSize);
+    fls2 = new FrequentLongsSketch(minSize);
     fle = fls1.merge(fls2);
     assertTrue(fle.isEmpty());
   }
@@ -472,9 +472,9 @@ public void checkSortItems() {
     final int sketchSize = Util.ceilingPowerOf2((int) (1.0 /(error_tolerance*ReversePurgeLongHashMap.getLoadFactor())));
     //println("sketchSize: "+sketchSize);
 
-    final LongsSketch[] sketches = new LongsSketch[numSketches];
+    final FrequentLongsSketch[] sketches = new FrequentLongsSketch[numSketches];
     for (int h = 0; h < numSketches; h++) {
-      sketches[h] = new LongsSketch(sketchSize);
+      sketches[h] = new FrequentLongsSketch(sketchSize);
     }
 
     long item;
@@ -524,7 +524,7 @@ public void checkStringDeserEmptyNotCorrupt() {
     final int size = 1 << LG_MIN_MAP_SIZE;
     final int thresh = (size * 3) / 4;
     final String fmt = "%6d%10s%s";
-    final LongsSketch fls = new LongsSketch(size);
+    final FrequentLongsSketch fls = new FrequentLongsSketch(size);
     println("Sketch Size: " + size);
     String s = null;
     int i = 0;
@@ -532,7 +532,7 @@ public void checkStringDeserEmptyNotCorrupt() {
       fls.update(i+1, 1);
       s = fls.serializeToString();
       println(String.format("SER   " + fmt, (i + 1), fls.isEmpty() + " : ", s ));
-      final LongsSketch fls2 = LongsSketch.getInstance(s);
+      final FrequentLongsSketch fls2 = FrequentLongsSketch.getInstance(s);
       println(String.format("DESER " + fmt, (i + 1), fls2.isEmpty() + " : ", s ));
     }
   }
@@ -547,21 +547,21 @@ public void checkStringDeserEmptyCorrupt() {
              + "1,"  //error offset
              + "0,"  //numActive ...conflict with empty
              + "8,"; //curMapLen
-    LongsSketch.getInstance(s);
+    FrequentLongsSketch.getInstance(s);
   }
 
   @Test
   public void checkGetEpsilon() {
-    assertEquals(LongsSketch.getEpsilon(1024), 3.5 / 1024, 0.0);
+    assertEquals(FrequentLongsSketch.getEpsilon(1024), 3.5 / 1024, 0.0);
     try {
-      LongsSketch.getEpsilon(1000);
+      FrequentLongsSketch.getEpsilon(1000);
     } catch (final SketchesArgumentException e) { }
   }
 
   @Test
   public void checkGetAprioriError() {
     final double eps = 3.5 / 1024;
-    assertEquals(LongsSketch.getAprioriError(1024, 10_000), eps * 10_000);
+    assertEquals(FrequentLongsSketch.getAprioriError(1024, 10_000), eps * 10_000);
   }
 
   @Test
@@ -572,7 +572,7 @@ public void printlnTest() {
   //Restricted methods
 
   public void printSketch(final int size, final long[] freqArr) {
-    final LongsSketch fls = new LongsSketch(size);
+    final FrequentLongsSketch fls = new FrequentLongsSketch(size);
     final StringBuilder sb = new StringBuilder();
     for (int i = 0; i sketch1 = new ItemsSketch<>(8);
+    final FrequentItemsSketch sketch1 = new FrequentItemsSketch<>(8);
     sketch1.update(1L);
     sketch1.update(2L);
     sketch1.update(3L);
     sketch1.update(4L);
 
     final byte[] bytes = sketch1.toByteArray(serDe);
-    final LongsSketch sketch2 = LongsSketch.getInstance(MemorySegment.ofArray(bytes));
+    final FrequentLongsSketch sketch2 = FrequentLongsSketch.getInstance(MemorySegment.ofArray(bytes));
     sketch2.update(2L);
     sketch2.update(3L);
     sketch2.update(2L);
@@ -57,14 +57,14 @@ public void itemsToLongs() {
 
   @Test
   public void longsToItems() {
-    final LongsSketch sketch1 = new LongsSketch(8);
+    final FrequentLongsSketch sketch1 = new FrequentLongsSketch(8);
     sketch1.update(1L);
     sketch1.update(2L);
     sketch1.update(3L);
     sketch1.update(4L);
 
     final byte[] bytes = sketch1.toByteArray();
-    final ItemsSketch sketch2 = ItemsSketch.getInstance(MemorySegment.ofArray(bytes), serDe);
+    final FrequentItemsSketch sketch2 = FrequentItemsSketch.getInstance(MemorySegment.ofArray(bytes), serDe);
     sketch2.update(2L);
     sketch2.update(3L);
     sketch2.update(2L);
diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchTest.java
index 6dddc7078..00cab5d32 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.datasketches.kll;
 
-import static org.apache.datasketches.kll.KllSketch.SketchType.DOUBLES_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_DOUBLES_SKETCH;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.EXCLUSIVE;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
@@ -470,7 +470,7 @@ public void checkSketchInitializeDirectDoubleUpdatableMemorySegment() {
     //println(sk2.toString(true, true));
     compBytes = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(compBytes);
-    println(KllPreambleUtil.toString(compBytes, DOUBLES_SKETCH, true));
+    println(KllPreambleUtil.toString(compBytes, KLL_DOUBLES_SKETCH, true));
     sk = KllDoublesSketch.wrap(wseg);
     assertEquals(sk.getK(), k);
     assertEquals(sk.getN(), k + 1);
@@ -490,7 +490,7 @@ public void checkSketchInitializeDirectDoubleUpdatableMemorySegment() {
     //println(sk.toString(true, true));
     compBytes = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(compBytes);
-    println(KllPreambleUtil.toString(compBytes, DOUBLES_SKETCH, true));
+    println(KllPreambleUtil.toString(compBytes, KLL_DOUBLES_SKETCH, true));
     sk = KllDoublesSketch.wrap(wseg);
     assertEquals(sk.getK(), k);
     assertEquals(sk.getN(), 0);
@@ -511,7 +511,7 @@ public void checkSketchInitializeDirectDoubleUpdatableMemorySegment() {
     //println(sk.toString(true, true));
     compBytes = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(compBytes);
-    println(KllPreambleUtil.toString(compBytes, DOUBLES_SKETCH, true));
+    println(KllPreambleUtil.toString(compBytes, KLL_DOUBLES_SKETCH, true));
     sk = KllDoublesSketch.wrap(wseg);
     assertEquals(sk.getK(), k);
     assertEquals(sk.getN(), 1);
@@ -535,9 +535,9 @@ public void checkGetMemorySegment() {
     assertFalse(sketch.isEmpty());
     assertTrue(sketch.isMemorySegmentUpdatableFormat());
     assertFalse(sketch.isEstimationMode());
-    assertTrue(sketch.isDoublesSketch());
+    assertTrue(sketch.isKllDoublesSketch());
     assertFalse(sketch.isLevelZeroSorted());
-    assertFalse(sketch.isFloatsSketch());
+    assertFalse(sketch.isKllFloatsSketch());
 
     final MemorySegment wseg = sketch.getMemorySegment();
     final KllDoublesSketch sk = KllHeapDoublesSketch.heapifyImpl(wseg);
@@ -546,9 +546,9 @@ public void checkGetMemorySegment() {
     assertFalse(sk.isEmpty());
     assertFalse(sk.isMemorySegmentUpdatableFormat());
     assertFalse(sk.isEstimationMode());
-    assertTrue(sk.isDoublesSketch());
+    assertTrue(sk.isKllDoublesSketch());
     assertFalse(sk.isLevelZeroSorted());
-    assertFalse(sk.isFloatsSketch());
+    assertFalse(sk.isKllFloatsSketch());
   }
 
   @Test
diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchTest.java
index 9a93b6550..ca1e35463 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.datasketches.kll;
 
-import static org.apache.datasketches.kll.KllSketch.SketchType.FLOATS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_FLOATS_SKETCH;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.EXCLUSIVE;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
@@ -470,7 +470,7 @@ public void checkSketchInitializeDirectFloatUpdatableMemorySegment() {
     //println(sk2.toString(true, true));
     compBytes = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(compBytes);
-    println(KllPreambleUtil.toString(compBytes, FLOATS_SKETCH, true));
+    println(KllPreambleUtil.toString(compBytes, KLL_FLOATS_SKETCH, true));
     sk = KllFloatsSketch.wrap(wseg);
     assertEquals(sk.getK(), k);
     assertEquals(sk.getN(), k + 1);
@@ -490,7 +490,7 @@ public void checkSketchInitializeDirectFloatUpdatableMemorySegment() {
     //println(sk.toString(true, true));
     compBytes = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(compBytes);
-    println(KllPreambleUtil.toString(compBytes, FLOATS_SKETCH, true));
+    println(KllPreambleUtil.toString(compBytes, KLL_FLOATS_SKETCH, true));
     sk = KllFloatsSketch.wrap(wseg);
     assertEquals(sk.getK(), k);
     assertEquals(sk.getN(), 0);
@@ -511,7 +511,7 @@ public void checkSketchInitializeDirectFloatUpdatableMemorySegment() {
     //println(sk.toString(true, true));
     compBytes = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(compBytes);
-    println(KllPreambleUtil.toString(compBytes, FLOATS_SKETCH, true));
+    println(KllPreambleUtil.toString(compBytes, KLL_FLOATS_SKETCH, true));
     sk = KllFloatsSketch.wrap(wseg);
     assertEquals(sk.getK(), k);
     assertEquals(sk.getN(), 1);
@@ -535,9 +535,9 @@ public void checkGetMemorySegment() {
     assertFalse(sketch.isEmpty());
     assertTrue(sketch.isMemorySegmentUpdatableFormat());
     assertFalse(sketch.isEstimationMode());
-    assertTrue(sketch.isFloatsSketch());
+    assertTrue(sketch.isKllFloatsSketch());
     assertFalse(sketch.isLevelZeroSorted());
-    assertFalse(sketch.isDoublesSketch());
+    assertFalse(sketch.isKllDoublesSketch());
 
     final MemorySegment wseg = sketch.getMemorySegment();
     final KllFloatsSketch sk = KllHeapFloatsSketch.heapifyImpl(wseg);
@@ -546,9 +546,9 @@ public void checkGetMemorySegment() {
     assertFalse(sk.isEmpty());
     assertFalse(sk.isMemorySegmentUpdatableFormat());
     assertFalse(sk.isEstimationMode());
-    assertTrue(sk.isFloatsSketch());
+    assertTrue(sk.isKllFloatsSketch());
     assertFalse(sk.isLevelZeroSorted());
-    assertFalse(sk.isDoublesSketch());
+    assertFalse(sk.isKllDoublesSketch());
   }
 
   @Test
diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectLongsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectLongsSketchTest.java
index d684ad1cc..e4c3438ea 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDirectLongsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDirectLongsSketchTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.datasketches.kll;
 
-import static org.apache.datasketches.kll.KllSketch.SketchType.LONGS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_LONGS_SKETCH;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.EXCLUSIVE;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
@@ -462,7 +462,7 @@ public void checkSketchInitializeDirectLongUpdatableMemorySegment() {
     //println(sk2.toString(true, true));
     compBytes = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(compBytes);
-    println(KllPreambleUtil.toString(compBytes, LONGS_SKETCH, true));
+    println(KllPreambleUtil.toString(compBytes, KLL_LONGS_SKETCH, true));
     sk = KllLongsSketch.wrap(wseg);
     assertEquals(sk.getK(), k);
     assertEquals(sk.getN(), k + 1);
@@ -482,7 +482,7 @@ public void checkSketchInitializeDirectLongUpdatableMemorySegment() {
     //println(sk.toString(true, true));
     compBytes = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(compBytes);
-    println(KllPreambleUtil.toString(compBytes, LONGS_SKETCH, true));
+    println(KllPreambleUtil.toString(compBytes, KLL_LONGS_SKETCH, true));
     sk = KllLongsSketch.wrap(wseg);
     assertEquals(sk.getK(), k);
     assertEquals(sk.getN(), 0);
@@ -503,7 +503,7 @@ public void checkSketchInitializeDirectLongUpdatableMemorySegment() {
     //println(sk.toString(true, true));
     compBytes = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(compBytes);
-    println(KllPreambleUtil.toString(compBytes, LONGS_SKETCH, true));
+    println(KllPreambleUtil.toString(compBytes, KLL_LONGS_SKETCH, true));
     sk = KllLongsSketch.wrap(wseg);
     assertEquals(sk.getK(), k);
     assertEquals(sk.getN(), 1);
@@ -527,9 +527,9 @@ public void checkGetMemorySegment() {
     assertFalse(sketch.isEmpty());
     assertTrue(sketch.isMemorySegmentUpdatableFormat());
     assertFalse(sketch.isEstimationMode());
-    assertTrue(sketch.isLongsSketch());
+    assertTrue(sketch.isKllLongsSketch());
     assertFalse(sketch.isLevelZeroSorted());
-    assertFalse(sketch.isDoublesSketch());
+    assertFalse(sketch.isKllDoublesSketch());
 
     final MemorySegment wseg = sketch.getMemorySegment();
     final KllLongsSketch sk = KllHeapLongsSketch.heapifyImpl(wseg);
@@ -538,9 +538,9 @@ public void checkGetMemorySegment() {
     assertFalse(sk.isEmpty());
     assertFalse(sk.isMemorySegmentUpdatableFormat());
     assertFalse(sk.isEstimationMode());
-    assertTrue(sk.isLongsSketch());
+    assertTrue(sk.isKllLongsSketch());
     assertFalse(sk.isLevelZeroSorted());
-    assertFalse(sk.isDoublesSketch());
+    assertFalse(sk.isKllDoublesSketch());
   }
 
   @Test
diff --git a/src/test/java/org/apache/datasketches/kll/KllDoublesSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllDoublesSketchTest.java
index bbd29ed59..f2706af79 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDoublesSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDoublesSketchTest.java
@@ -21,7 +21,7 @@
 
 import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 import static java.lang.Math.min;
-import static org.apache.datasketches.kll.KllSketch.SketchType.DOUBLES_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_DOUBLES_SKETCH;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.EXCLUSIVE;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.INCLUSIVE;
 import static org.testng.Assert.assertEquals;
@@ -427,8 +427,8 @@ public void checkNewDirectInstanceAndSize() {
     KllDoublesSketch.newDirectInstance(wseg);
     try { KllDoublesSketch.newDirectInstance(null); fail(); }
     catch (final NullPointerException e) { }
-    final int updateSize = KllSketch.getMaxSerializedSizeBytes(200, 0, DOUBLES_SKETCH, true);
-    final int compactSize = KllSketch.getMaxSerializedSizeBytes(200, 0, DOUBLES_SKETCH, false);
+    final int updateSize = KllSketch.getMaxSerializedSizeBytes(200, 0, KLL_DOUBLES_SKETCH, true);
+    final int compactSize = KllSketch.getMaxSerializedSizeBytes(200, 0, KLL_DOUBLES_SKETCH, false);
     assertTrue(compactSize < updateSize);
   }
 
diff --git a/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java
index a4304bffc..06d81bf09 100644
--- a/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java
@@ -21,7 +21,7 @@
 
 import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 import static java.lang.Math.min;
-import static org.apache.datasketches.kll.KllSketch.SketchType.FLOATS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_FLOATS_SKETCH;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.EXCLUSIVE;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.INCLUSIVE;
 import static org.testng.Assert.assertEquals;
@@ -427,8 +427,8 @@ public void checkNewDirectInstanceAndSize() {
     KllFloatsSketch.newDirectInstance(wseg);
     try { KllFloatsSketch.newDirectInstance(null); fail(); }
     catch (final NullPointerException e) { }
-    final int updateSize = KllSketch.getMaxSerializedSizeBytes(200, 0, FLOATS_SKETCH, true);
-    final int compactSize = KllSketch.getMaxSerializedSizeBytes(200, 0, FLOATS_SKETCH, false);
+    final int updateSize = KllSketch.getMaxSerializedSizeBytes(200, 0, KLL_FLOATS_SKETCH, true);
+    final int compactSize = KllSketch.getMaxSerializedSizeBytes(200, 0, KLL_FLOATS_SKETCH, false);
     assertTrue(compactSize < updateSize);
   }
 
diff --git a/src/test/java/org/apache/datasketches/kll/KllHelperTest.java b/src/test/java/org/apache/datasketches/kll/KllHelperTest.java
index 7b62465e8..5acb068a0 100644
--- a/src/test/java/org/apache/datasketches/kll/KllHelperTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllHelperTest.java
@@ -223,35 +223,35 @@ public void checkUpdatableSerDeItem() {
   @Test
   public void getMaxCompactDoublesSerializedSizeBytes() {
     final int sizeBytes =
-        KllSketch.getMaxSerializedSizeBytes(KllSketch.DEFAULT_K, 1L << 30, DOUBLES_SKETCH, false);
+        KllSketch.getMaxSerializedSizeBytes(KllSketch.DEFAULT_K, 1L << 30, KLL_DOUBLES_SKETCH, false);
     assertEquals(sizeBytes, 5704);
   }
 
   @Test
   public void getMaxCompactFloatsSerializedSizeBytes() {
     final int sizeBytes =
-        KllSketch.getMaxSerializedSizeBytes(KllSketch.DEFAULT_K, 1L << 30, FLOATS_SKETCH, false);
+        KllSketch.getMaxSerializedSizeBytes(KllSketch.DEFAULT_K, 1L << 30, KLL_FLOATS_SKETCH, false);
     assertEquals(sizeBytes, 2908);
   }
 
   @Test
   public void getMaxUpdatableDoubleSerializedSizeBytes() {
     final int sizeBytes =
-        KllSketch.getMaxSerializedSizeBytes(KllSketch.DEFAULT_K, 1L << 30, DOUBLES_SKETCH, true);
+        KllSketch.getMaxSerializedSizeBytes(KllSketch.DEFAULT_K, 1L << 30, KLL_DOUBLES_SKETCH, true);
     assertEquals(sizeBytes, 5708);
   }
 
   @Test
   public void getMaxUpdatableFloatsSerializedSizeBytes() {
     final int sizeBytes =
-        KllSketch.getMaxSerializedSizeBytes(KllSketch.DEFAULT_K, 1L << 30, FLOATS_SKETCH, true);
+        KllSketch.getMaxSerializedSizeBytes(KllSketch.DEFAULT_K, 1L << 30, KLL_FLOATS_SKETCH, true);
     assertEquals(sizeBytes, 2912);
   }
 
   @Test
   public void getMaxUpdatableItemsSerializedSizeBytes() {
     try {
-      KllSketch.getMaxSerializedSizeBytes(KllSketch.DEFAULT_K, 1L << 30, ITEMS_SKETCH, true);
+      KllSketch.getMaxSerializedSizeBytes(KllSketch.DEFAULT_K, 1L << 30, KLL_ITEMS_SKETCH, true);
     } catch (final SketchesArgumentException e) { }
   }
 
@@ -283,7 +283,7 @@ public void testGetAllLevelStatsDoubles() {
     final int k = 200;
     final int m = KllSketch.DEFAULT_M;
     final KllHelper.GrowthStats gStats =
-        KllHelper.getGrowthSchemeForGivenN(k, m, n, DOUBLES_SKETCH, true);
+        KllHelper.getGrowthSchemeForGivenN(k, m, n, KLL_DOUBLES_SKETCH, true);
     assertEquals(gStats.maxN, 1_257_766_904);
     assertEquals(gStats.numLevels, 23);
     assertEquals(gStats.maxItems, 697);
@@ -297,7 +297,7 @@ public void testGetAllLevelStatsFloats() {
     final int k = 200;
     final int m = KllSketch.DEFAULT_M;
     final KllHelper.GrowthStats gStats =
-        KllHelper.getGrowthSchemeForGivenN(k, m, n, FLOATS_SKETCH, true);
+        KllHelper.getGrowthSchemeForGivenN(k, m, n, KLL_FLOATS_SKETCH, true);
     assertEquals(gStats.maxN, 1_257_766_904);
     assertEquals(gStats.numLevels, 23);
     assertEquals(gStats.maxItems, 697);
@@ -311,7 +311,7 @@ public void testGetAllLevelStatsDoubles2() {
     final int k = 200;
     final int m = KllSketch.DEFAULT_M;
     final KllHelper.GrowthStats gStats =
-        KllHelper.getGrowthSchemeForGivenN(k, m, n, DOUBLES_SKETCH, true);
+        KllHelper.getGrowthSchemeForGivenN(k, m, n, KLL_DOUBLES_SKETCH, true);
     assertEquals(gStats.maxN, 533);
     assertEquals(gStats.numLevels, 2);
     assertEquals(gStats.maxItems, 333);
@@ -325,7 +325,7 @@ public void testGetAllLevelStatsFloats2() {
     final int k = 200;
     final int m = KllSketch.DEFAULT_M;
     final KllHelper.GrowthStats gStats =
-        KllHelper.getGrowthSchemeForGivenN(k, m, n, FLOATS_SKETCH, true);
+        KllHelper.getGrowthSchemeForGivenN(k, m, n, KLL_FLOATS_SKETCH, true);
     assertEquals(gStats.maxN, 533);
     assertEquals(gStats.numLevels, 2);
     assertEquals(gStats.maxItems, 333);
@@ -339,7 +339,7 @@ public void testGetAllLevelStatsItems() {
     final int k = 200;
     final int m = KllSketch.DEFAULT_M;
     try {
-      KllHelper.getGrowthSchemeForGivenN(k, m, n, ITEMS_SKETCH, true);
+      KllHelper.getGrowthSchemeForGivenN(k, m, n, KLL_ITEMS_SKETCH, true);
     } catch (final SketchesArgumentException e) { }
   }
 
diff --git a/src/test/java/org/apache/datasketches/kll/KllItemsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllItemsSketchTest.java
index 922ff151b..c249961a8 100644
--- a/src/test/java/org/apache/datasketches/kll/KllItemsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllItemsSketchTest.java
@@ -26,7 +26,7 @@
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_FULL;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_SINGLE;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.UPDATABLE;
-import static org.apache.datasketches.kll.KllSketch.SketchType.ITEMS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_ITEMS_SKETCH;
 import static org.apache.datasketches.quantilescommon.LongsAsOrderableStrings.getString;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.EXCLUSIVE;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.INCLUSIVE;
@@ -636,7 +636,7 @@ public void checkIsSameResource() {
   public void checkHeapifyEmpty() {
     final KllItemsSketch sk1 = KllItemsSketch.newHeapInstance(20, Comparator.naturalOrder(), serDe);
     final MemorySegment seg = MemorySegment.ofArray(sk1.toByteArray());
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(seg, SketchType.ITEMS_SKETCH, serDe);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(seg, SketchType.KLL_ITEMS_SKETCH, serDe);
     assertEquals(segVal.sketchStructure, COMPACT_EMPTY);
     assertEquals(seg.byteSize(), 8);
     final KllItemsSketch sk2 = KllItemsSketch.heapify(seg, Comparator.naturalOrder(), serDe);
@@ -647,7 +647,7 @@ public void checkHeapifyEmpty() {
     try { sk2.getMaxItem(); fail(); } catch (final SketchesArgumentException e) { }
     println(sk1.toString(true, true));
     println("");
-    println(KllPreambleUtil.toString(seg, ITEMS_SKETCH, true, serDe));
+    println(KllPreambleUtil.toString(seg, KLL_ITEMS_SKETCH, true, serDe));
   }
 
   @Test
@@ -655,7 +655,7 @@ public void checkHeapifySingleItem() {
     final KllItemsSketch sk1 = KllItemsSketch.newHeapInstance(20, Comparator.naturalOrder(), serDe);
     sk1.update("A");
     final MemorySegment seg = MemorySegment.ofArray(sk1.toByteArray());
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(seg, SketchType.ITEMS_SKETCH, serDe);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(seg, SketchType.KLL_ITEMS_SKETCH, serDe);
     assertEquals(segVal.sketchStructure, COMPACT_SINGLE);
     assertEquals(seg.byteSize(), segVal.sketchBytes);
     final KllItemsSketch sk2 = KllItemsSketch.heapify(seg, Comparator.naturalOrder(), serDe);
@@ -666,7 +666,7 @@ public void checkHeapifySingleItem() {
     assertEquals(sk2.getMaxItem(), "A");
     println(sk1.toString(true, true));
     println("");
-    println(KllPreambleUtil.toString(seg, ITEMS_SKETCH, true, serDe));
+    println(KllPreambleUtil.toString(seg, KLL_ITEMS_SKETCH, true, serDe));
   }
 
   @Test
@@ -676,12 +676,12 @@ public void checkHeapifyFewItems() {
     sk1.update("AB");
     sk1.update("ABC");
     final MemorySegment seg = MemorySegment.ofArray(sk1.toByteArray());
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(seg, SketchType.ITEMS_SKETCH, serDe);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(seg, SketchType.KLL_ITEMS_SKETCH, serDe);
     assertEquals(segVal.sketchStructure, COMPACT_FULL);
     assertEquals(seg.byteSize(), segVal.sketchBytes);
     println(sk1.toString(true, true));
     println("");
-    println(KllPreambleUtil.toString(seg, ITEMS_SKETCH, true, serDe));
+    println(KllPreambleUtil.toString(seg, KLL_ITEMS_SKETCH, true, serDe));
   }
 
   @Test
@@ -693,12 +693,12 @@ public void checkHeapifyManyItems() {
       sk1.update(Util.longToFixedLengthString(i, digits));
     }
     final MemorySegment seg = MemorySegment.ofArray(sk1.toByteArray());
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(seg, SketchType.ITEMS_SKETCH, serDe);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(seg, SketchType.KLL_ITEMS_SKETCH, serDe);
     assertEquals(segVal.sketchStructure, COMPACT_FULL);
     assertEquals(seg.byteSize(), segVal.sketchBytes);
     println(sk1.toString(true, true));
     println("");
-    println(KllPreambleUtil.toString(seg, ITEMS_SKETCH, true, serDe));
+    println(KllPreambleUtil.toString(seg, KLL_ITEMS_SKETCH, true, serDe));
   }
 
   @Test
@@ -718,7 +718,7 @@ public void checkWrapCausingLevelsCompaction() {
     println("");
     println(sk2.toString(true, true));
     println("");
-    println(KllPreambleUtil.toString(seg, ITEMS_SKETCH, true, serDe));
+    println(KllPreambleUtil.toString(seg, KLL_ITEMS_SKETCH, true, serDe));
   }
 
   @Test
diff --git a/src/test/java/org/apache/datasketches/kll/KllLongsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllLongsSketchTest.java
index 08a4fa160..0721d6335 100644
--- a/src/test/java/org/apache/datasketches/kll/KllLongsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllLongsSketchTest.java
@@ -21,7 +21,7 @@
 
 import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 import static java.lang.Math.min;
-import static org.apache.datasketches.kll.KllSketch.SketchType.LONGS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_LONGS_SKETCH;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.EXCLUSIVE;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.INCLUSIVE;
 import static org.testng.Assert.assertEquals;
@@ -419,8 +419,8 @@ public void checkNewDirectInstanceAndSize() {
     KllLongsSketch.newDirectInstance(wseg);
     try { KllLongsSketch.newDirectInstance(null); fail(); }
     catch (final NullPointerException e) { }
-    final int updateSize = KllSketch.getMaxSerializedSizeBytes(200, 0, LONGS_SKETCH, true);
-    final int compactSize = KllSketch.getMaxSerializedSizeBytes(200, 0, LONGS_SKETCH, false);
+    final int updateSize = KllSketch.getMaxSerializedSizeBytes(200, 0, KLL_LONGS_SKETCH, true);
+    final int compactSize = KllSketch.getMaxSerializedSizeBytes(200, 0, KLL_LONGS_SKETCH, false);
     assertTrue(compactSize < updateSize);
   }
 
diff --git a/src/test/java/org/apache/datasketches/kll/KllMemorySegmentRequestApp.java b/src/test/java/org/apache/datasketches/kll/KllMemorySegmentRequestApp.java
index f0ed246ae..893379cdc 100644
--- a/src/test/java/org/apache/datasketches/kll/KllMemorySegmentRequestApp.java
+++ b/src/test/java/org/apache/datasketches/kll/KllMemorySegmentRequestApp.java
@@ -45,7 +45,7 @@ public void checkMemorySegmentRequestExample() {
 
     //The allocation of the original off-heap MemorySegment for the KllLongsSketch
     //Note that this targets the size to only handle k values, which is quite small.
-    final int numBytes = KllSketch.getMaxSerializedSizeBytes(k, k, KllSketch.SketchType.LONGS_SKETCH, true);
+    final int numBytes = KllSketch.getMaxSerializedSizeBytes(k, k, KllSketch.SketchType.KLL_LONGS_SKETCH, true);
 
     final MemorySegment seg = mSegReqEx.request(numBytes);
 
diff --git a/src/test/java/org/apache/datasketches/kll/KllMemoryValidateTest.java b/src/test/java/org/apache/datasketches/kll/KllMemoryValidateTest.java
index 2236315e5..73468d439 100644
--- a/src/test/java/org/apache/datasketches/kll/KllMemoryValidateTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllMemoryValidateTest.java
@@ -27,8 +27,8 @@
 import static org.apache.datasketches.kll.KllPreambleUtil.setMemorySegmentFamilyID;
 import static org.apache.datasketches.kll.KllPreambleUtil.setMemorySegmentPreInts;
 import static org.apache.datasketches.kll.KllPreambleUtil.setMemorySegmentSerVer;
-import static org.apache.datasketches.kll.KllSketch.SketchType.DOUBLES_SKETCH;
-import static org.apache.datasketches.kll.KllSketch.SketchType.FLOATS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_DOUBLES_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_FLOATS_SKETCH;
 
 import java.lang.foreign.MemorySegment;
 
@@ -49,7 +49,7 @@ public void checkInvalidFamily() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentFamilyID(wseg, Family.KLL.getID() - 1);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, FLOATS_SKETCH);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -58,7 +58,7 @@ public void checkInvalidSerVer() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentSerVer(wseg, SERIAL_VERSION_EMPTY_FULL - 1);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, FLOATS_SKETCH);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -68,7 +68,7 @@ public void checkInvalidEmptyAndSingleFormat() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentEmptyFlag(wseg, true);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, FLOATS_SKETCH);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -77,7 +77,7 @@ public void checkInvalidUpdatableAndSerVer() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentSerVer(wseg, SERIAL_VERSION_SINGLE);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, FLOATS_SKETCH);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -87,7 +87,7 @@ public void checkInvalidSingleAndPreInts() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentPreInts(wseg, PREAMBLE_INTS_FULL);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, FLOATS_SKETCH);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -97,7 +97,7 @@ public void checkInvalidSingleAndSerVer() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentSerVer(wseg, SERIAL_VERSION_EMPTY_FULL);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, FLOATS_SKETCH);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -106,7 +106,7 @@ public void checkInvalidEmptyDoublesAndPreIntsFull() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentPreInts(wseg, PREAMBLE_INTS_FULL);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, DOUBLES_SKETCH);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_DOUBLES_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -116,7 +116,7 @@ public void checkInvalidSingleDoubleCompactAndSerVer() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentSerVer(wseg, SERIAL_VERSION_EMPTY_FULL);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, DOUBLES_SKETCH);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_DOUBLES_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -125,7 +125,7 @@ public void checkInvalidDoubleUpdatableAndPreInts() {
     final byte[] byteArr = KllHelper.toByteArray(sk, true);
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentPreInts(wseg, PREAMBLE_INTS_EMPTY_SINGLE);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, DOUBLES_SKETCH);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_DOUBLES_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -135,7 +135,7 @@ public void checkInvalidFloatFullAndPreInts() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentPreInts(wseg, PREAMBLE_INTS_EMPTY_SINGLE);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, FLOATS_SKETCH);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -145,7 +145,7 @@ public void checkInvalidFloatUpdatableFullAndPreInts() {
     final byte[] byteArr = KllHelper.toByteArray(sk, true);
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentPreInts(wseg, PREAMBLE_INTS_EMPTY_SINGLE);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, FLOATS_SKETCH);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -155,7 +155,7 @@ public void checkInvalidDoubleCompactSingleAndPreInts() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentPreInts(wseg, PREAMBLE_INTS_FULL);//should be 2, single
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, DOUBLES_SKETCH);
+    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_DOUBLES_SKETCH);
   }
 
 }
diff --git a/src/test/java/org/apache/datasketches/kll/KllMiscDirectDoublesTest.java b/src/test/java/org/apache/datasketches/kll/KllMiscDirectDoublesTest.java
index fb2fa0e3d..88437488b 100644
--- a/src/test/java/org/apache/datasketches/kll/KllMiscDirectDoublesTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllMiscDirectDoublesTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.datasketches.kll;
 
-import static org.apache.datasketches.kll.KllSketch.SketchType.DOUBLES_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_DOUBLES_SKETCH;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
@@ -328,13 +328,13 @@ public void checkMemoryToStringDoubleUpdatable() {
     for (int i = 1; i <= (k + 1); i++) { sk.update(i); }
     upBytes = KllHelper.toByteArray(sk, true);
     wseg = MemorySegment.ofArray(upBytes);
-    s = KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true);
     println("step 1: sketch to byte[]/MemorySegment & analyze MemorySegment");
     println(s);
     sk2 = KllDoublesSketch.wrap(wseg);
     upBytes2 = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(upBytes2);
-    s = KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true);
     println("step 2: MemorySegment to heap sketch, to byte[]/MemorySegment & analyze MemorySegment. Should match above");
     println(s);
     assertEquals(upBytes, upBytes2);
@@ -343,13 +343,13 @@ public void checkMemoryToStringDoubleUpdatable() {
     sk = getDirectDoublesSketch(k, 0);
     upBytes = KllHelper.toByteArray(sk, true);
     wseg = MemorySegment.ofArray(upBytes);
-    s = KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true);
     println("step 1: sketch to byte[]/MemorySegment & analyze MemorySegment");
     println(s);
     sk2 = KllDoublesSketch.wrap(wseg);
     upBytes2 = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(upBytes2);
-    s = KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true);
     println("step 2: MemorySegment to heap sketch, to byte[]/MemorySegment & analyze MemorySegment. Should match above");
     println(s);
     assertEquals(upBytes, upBytes2);
@@ -359,13 +359,13 @@ public void checkMemoryToStringDoubleUpdatable() {
     sk.update(1);
     upBytes = KllHelper.toByteArray(sk, true);
     wseg = MemorySegment.ofArray(upBytes);
-    s = KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true);
     println("step 1: sketch to byte[]/MemorySegment & analyze MemorySegment");
     println(s);
     sk2 = KllDoublesSketch.wrap(wseg);
     upBytes2 = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(upBytes2);
-    s = KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true);
     println("step 2: MemorySegment to heap sketch, to byte[]/MemorySegment & analyze MemorySegment. Should match above");
     println(s);
     assertEquals(upBytes, upBytes2);
diff --git a/src/test/java/org/apache/datasketches/kll/KllMiscDirectFloatsTest.java b/src/test/java/org/apache/datasketches/kll/KllMiscDirectFloatsTest.java
index 58c461f13..9c795200b 100644
--- a/src/test/java/org/apache/datasketches/kll/KllMiscDirectFloatsTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllMiscDirectFloatsTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.datasketches.kll;
 
-import static org.apache.datasketches.kll.KllSketch.SketchType.FLOATS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_FLOATS_SKETCH;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
@@ -328,13 +328,13 @@ public void checkMemoryToStringFloatUpdatable() {
     for (int i = 1; i <= (k + 1); i++) { sk.update(i); }
     upBytes = KllHelper.toByteArray(sk, true);
     wseg = MemorySegment.ofArray(upBytes);
-    s = KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true);
     println("step 1: sketch to byte[]/MemorySegment & analyze MemorySegment");
     println(s);
     sk2 = KllFloatsSketch.wrap(wseg);
     upBytes2 = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(upBytes2);
-    s = KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true);
     println("step 2: MemorySegment to heap sketch, to byte[]/MemorySegment & analyze MemorySegment. Should match above");
     println(s);
     assertEquals(upBytes, upBytes2);
@@ -343,13 +343,13 @@ public void checkMemoryToStringFloatUpdatable() {
     sk = getDirectFloatsSketch(k, 0);
     upBytes = KllHelper.toByteArray(sk, true);
     wseg = MemorySegment.ofArray(upBytes);
-    s = KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true);
     println("step 1: sketch to byte[]/MemorySegment & analyze MemorySegment");
     println(s);
     sk2 = KllFloatsSketch.wrap(wseg);
     upBytes2 = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(upBytes2);
-    s = KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true);
     println("step 2: MemorySegment to heap sketch, to byte[]/MemorySegment & analyze MemorySegment. Should match above");
     println(s);
     assertEquals(upBytes, upBytes2);
@@ -359,13 +359,13 @@ public void checkMemoryToStringFloatUpdatable() {
     sk.update(1);
     upBytes = KllHelper.toByteArray(sk, true);
     wseg = MemorySegment.ofArray(upBytes);
-    s = KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true);
     println("step 1: sketch to byte[]/MemorySegment & analyze MemorySegment");
     println(s);
     sk2 = KllFloatsSketch.wrap(wseg);
     upBytes2 = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(upBytes2);
-    s = KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true);
     println("step 2: MemorySegment to heap sketch, to byte[]/MemorySegment & analyze MemorySegment. Should match above");
     println(s);
     assertEquals(upBytes, upBytes2);
diff --git a/src/test/java/org/apache/datasketches/kll/KllMiscDirectLongsTest.java b/src/test/java/org/apache/datasketches/kll/KllMiscDirectLongsTest.java
index 515b8ef83..fca3640e2 100644
--- a/src/test/java/org/apache/datasketches/kll/KllMiscDirectLongsTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllMiscDirectLongsTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.datasketches.kll;
 
-import static org.apache.datasketches.kll.KllSketch.SketchType.LONGS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_LONGS_SKETCH;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
@@ -328,13 +328,13 @@ public void checkMemoryToStringLongUpdatable() {
     for (int i = 1; i <= (k + 1); i++) { sk.update(i); }
     upBytes = KllHelper.toByteArray(sk, true);
     wseg = MemorySegment.ofArray(upBytes);
-    s = KllPreambleUtil.toString(wseg, LONGS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true);
     println("step 1: sketch to byte[]/MemorySegment & analyze MemorySegment");
     println(s);
     sk2 = KllLongsSketch.wrap(wseg);
     upBytes2 = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(upBytes2);
-    s = KllPreambleUtil.toString(wseg, LONGS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true);
     println("step 2: MemorySegment to heap sketch, to byte[]/MemorySegment & analyze MemorySegment. Should match above");
     println(s);
     assertEquals(upBytes, upBytes2);
@@ -343,13 +343,13 @@ public void checkMemoryToStringLongUpdatable() {
     sk = getDirectLongsSketch(k, 0);
     upBytes = KllHelper.toByteArray(sk, true);
     wseg = MemorySegment.ofArray(upBytes);
-    s = KllPreambleUtil.toString(wseg, LONGS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true);
     println("step 1: sketch to byte[]/MemorySegment & analyze MemorySegment");
     println(s);
     sk2 = KllLongsSketch.wrap(wseg);
     upBytes2 = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(upBytes2);
-    s = KllPreambleUtil.toString(wseg, LONGS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true);
     println("step 2: MemorySegment to heap sketch, to byte[]/MemorySegment & analyze MemorySegment. Should match above");
     println(s);
     assertEquals(upBytes, upBytes2);
@@ -359,13 +359,13 @@ public void checkMemoryToStringLongUpdatable() {
     sk.update(1);
     upBytes = KllHelper.toByteArray(sk, true);
     wseg = MemorySegment.ofArray(upBytes);
-    s = KllPreambleUtil.toString(wseg, LONGS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true);
     println("step 1: sketch to byte[]/MemorySegment & analyze MemorySegment");
     println(s);
     sk2 = KllLongsSketch.wrap(wseg);
     upBytes2 = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(upBytes2);
-    s = KllPreambleUtil.toString(wseg, LONGS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true);
     println("step 2: MemorySegment to heap sketch, to byte[]/MemorySegment & analyze MemorySegment. Should match above");
     println(s);
     assertEquals(upBytes, upBytes2);
diff --git a/src/test/java/org/apache/datasketches/kll/KllMiscDoublesTest.java b/src/test/java/org/apache/datasketches/kll/KllMiscDoublesTest.java
index 4d2d98e8d..daab63288 100644
--- a/src/test/java/org/apache/datasketches/kll/KllMiscDoublesTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllMiscDoublesTest.java
@@ -22,7 +22,7 @@
 import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 import static org.apache.datasketches.common.Util.LS;
 import static org.apache.datasketches.common.Util.bitAt;
-import static org.apache.datasketches.kll.KllSketch.SketchType.DOUBLES_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_DOUBLES_SKETCH;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.INCLUSIVE;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
@@ -202,7 +202,7 @@ public void viewDirectCompactions() {
     final boolean withLevels = false;
     final boolean withLevelsAndItems = true;
     int compaction = 0;
-    final int sizeBytes = KllSketch.getMaxSerializedSizeBytes(k, n, DOUBLES_SKETCH, true);
+    final int sizeBytes = KllSketch.getMaxSerializedSizeBytes(k, n, KLL_DOUBLES_SKETCH, true);
     final MemorySegment wseg = MemorySegment.ofArray(new byte[sizeBytes]);
     final KllDoublesSketch sk = KllDoublesSketch.newDirectInstance(k, wseg, null);
     for (int i = 1; i <= n; i++) {
@@ -481,7 +481,7 @@ public void checkSketchInitializeDoubleHeapifyCompactMemorySegment() {
     // println(sk2.toString(true, true));
     compBytes = sk2.toByteArray();
     wseg = MemorySegment.ofArray(compBytes);
-    println(KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true));
+    println(KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true));
     sk = KllDoublesSketch.heapify(wseg);
     assertEquals(sk.getK(), k);
     assertEquals(sk.getN(), k + 1);
@@ -552,7 +552,7 @@ public void checkSketchInitializeDoubleHeapifyUpdatableMemorySegment() {
     //println(sk2.toString(true, true));
     compBytes = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(compBytes);
-    println(KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true));
+    println(KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true));
     sk = KllHeapDoublesSketch.heapifyImpl(wseg);
     assertEquals(sk.getK(), k);
     assertEquals(sk.getN(), k + 1);
@@ -624,13 +624,13 @@ public void checkMemoryToStringDoubleCompact() {
     for (int i = 1; i <= (k + 1); i++) { sk.update(i); }
     compBytes = sk.toByteArray();
     wseg = MemorySegment.ofArray(compBytes);
-    s = KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true);
     println("step 1: sketch to byte[]/segory & analyze segory");
     println(s);
     sk2 = KllDoublesSketch.heapify(wseg);
     compBytes2 = sk2.toByteArray();
     wseg = MemorySegment.ofArray(compBytes2);
-    s = KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true);
     println("step 2: segorySegment to heap sketch, to byte[]/MemorySegment & analyze MemorySegment. Should match above");
     println(s);
     assertEquals(compBytes, compBytes2);
@@ -639,13 +639,13 @@ public void checkMemoryToStringDoubleCompact() {
     sk = KllDoublesSketch.newHeapInstance(20);
     compBytes = sk.toByteArray();
     wseg = MemorySegment.ofArray(compBytes);
-    s = KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true);
     println("step 1: sketch to byte[]/MemorySegment & analyze MemorySegment");
     println(s);
     sk2 = KllDoublesSketch.heapify(wseg);
     compBytes2 = sk2.toByteArray();
     wseg = MemorySegment.ofArray(compBytes2);
-    s = KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true);
     println("step 2: MemorySegment to heap sketch, to byte[]/MemorySegment & analyze MemorySegment. Should match above");
     println(s);
     assertEquals(compBytes, compBytes2);
@@ -655,13 +655,13 @@ public void checkMemoryToStringDoubleCompact() {
     sk.update(1);
     compBytes = sk.toByteArray();
     wseg = MemorySegment.ofArray(compBytes);
-    s = KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true);
     println("step 1: sketch to byte[]/MemorySegment & analyze MemorySegment");
     println(s);
     sk2 = KllDoublesSketch.heapify(wseg);
     compBytes2 = sk2.toByteArray();
     wseg = MemorySegment.ofArray(compBytes2);
-    s = KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true);
     println("step 2: MemorySegment to heap sketch, to byte[]/MemorySegment & analyze MemorySegment. Should match above");
     println(s);
     assertEquals(compBytes, compBytes2);
@@ -682,13 +682,13 @@ public void checkMemoryToStringDoubleUpdatable() {
     for (int i = 1; i <= (k + 1); i++) { sk.update(i); }
     upBytes = KllHelper.toByteArray(sk, true);
     wseg = MemorySegment.ofArray(upBytes);
-    s = KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true);
     println("step 1: sketch to byte[]/MemorySegment & analyze MemorySegment");
     println(s);
     sk2 = KllHeapDoublesSketch.heapifyImpl(wseg);
     upBytes2 = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(upBytes2);
-    s = KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true);
     println("step 2: MemorySegment to heap sketch, to byte[]/MemorySegment & analyze MemorySegment. Should match above");
     println(s); //note: heapify does not copy free space, while toUpdatableByteArray does
     assertEquals(sk.getN(), sk2.getN());
@@ -700,13 +700,13 @@ public void checkMemoryToStringDoubleUpdatable() {
     sk = KllDoublesSketch.newHeapInstance(k);
     upBytes = KllHelper.toByteArray(sk, true);
     wseg = MemorySegment.ofArray(upBytes);
-    s = KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true);
     println("step 1: sketch to byte[]/MemorySegment & analyze MemorySegment");
     println(s);
     sk2 = KllHeapDoublesSketch.heapifyImpl(wseg);
     upBytes2 = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(upBytes2);
-    s = KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true);
     println("step 2: MemorySegment to heap sketch, to byte[]/MemorySegment & analyze MemorySegment. Should match above");
     println(s);
     assertEquals(upBytes, upBytes2);
@@ -716,13 +716,13 @@ public void checkMemoryToStringDoubleUpdatable() {
     sk.update(1);
     upBytes = KllHelper.toByteArray(sk, true);
     wseg = MemorySegment.ofArray(upBytes);
-    s = KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true);
     println("step 1: sketch to byte[]/MemorySegment & analyze MemorySegment");
     println(s);
     sk2 = KllHeapDoublesSketch.heapifyImpl(wseg);
     upBytes2 = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(upBytes2);
-    s = KllPreambleUtil.toString(wseg, DOUBLES_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_DOUBLES_SKETCH, true);
     println("step 2: MemorySegment to heap sketch, to byte[]/MemorySegment & analyze MemorySegment. Should match above");
     println(s);
     assertEquals(upBytes, upBytes2);
diff --git a/src/test/java/org/apache/datasketches/kll/KllMiscFloatsTest.java b/src/test/java/org/apache/datasketches/kll/KllMiscFloatsTest.java
index dc57fc892..8a380b28c 100644
--- a/src/test/java/org/apache/datasketches/kll/KllMiscFloatsTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllMiscFloatsTest.java
@@ -22,7 +22,7 @@
 import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 import static org.apache.datasketches.common.Util.LS;
 import static org.apache.datasketches.common.Util.bitAt;
-import static org.apache.datasketches.kll.KllSketch.SketchType.FLOATS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_FLOATS_SKETCH;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.INCLUSIVE;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
@@ -202,7 +202,7 @@ public void viewDirectCompactions() {
     final boolean withLevels = false;
     final boolean withLevelsAndItems = true;
     int compaction = 0;
-    final int sizeBytes = KllSketch.getMaxSerializedSizeBytes(k, n, FLOATS_SKETCH, true);
+    final int sizeBytes = KllSketch.getMaxSerializedSizeBytes(k, n, KLL_FLOATS_SKETCH, true);
     final MemorySegment wseg = MemorySegment.ofArray(new byte[sizeBytes]);
     final KllFloatsSketch sk = KllFloatsSketch.newDirectInstance(k, wseg, null);
     for (int i = 1; i <= n; i++) {
@@ -481,7 +481,7 @@ public void checkSketchInitializeFloatHeapifyCompactMemorySegment() {
     //println(sk2.toString(true, true));
     compBytes = sk2.toByteArray();
     wseg = MemorySegment.ofArray(compBytes);
-    println(KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true));
+    println(KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true));
     sk = KllFloatsSketch.heapify(wseg);
     assertEquals(sk.getK(), k);
     assertEquals(sk.getN(), k + 1);
@@ -552,7 +552,7 @@ public void checkSketchInitializeFloatHeapifyUpdatableMemorySegment() {
     //println(sk2.toString(true, true));
     compBytes = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(compBytes);
-    println(KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true));
+    println(KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true));
     sk = KllHeapFloatsSketch.heapifyImpl(wseg);
     assertEquals(sk.getK(), k);
     assertEquals(sk.getN(), k + 1);
@@ -624,13 +624,13 @@ public void checkMemoryToStringFloatCompact() {
     for (int i = 1; i <= (k + 1); i++) { sk.update(i); }
     compBytes = sk.toByteArray();
     wseg = MemorySegment.ofArray(compBytes);
-    s = KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true);
     println("step 1: sketch to byte[]/segory & analyze segory");
     println(s);
     sk2 = KllFloatsSketch.heapify(wseg);
     compBytes2 = sk2.toByteArray();
     wseg = MemorySegment.ofArray(compBytes2);
-    s = KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true);
     println("step 2: segory to heap sketch, to byte[]/segory & analyze segory. Should match above");
     println(s);
     assertEquals(compBytes, compBytes2);
@@ -639,13 +639,13 @@ public void checkMemoryToStringFloatCompact() {
     sk = KllFloatsSketch.newHeapInstance(k);
     compBytes = sk.toByteArray();
     wseg = MemorySegment.ofArray(compBytes);
-    s = KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true);
     println("step 1: sketch to byte[]/segory & analyze segory");
     println(s);
     sk2 = KllFloatsSketch.heapify(wseg);
     compBytes2 = sk2.toByteArray();
     wseg = MemorySegment.ofArray(compBytes2);
-    s = KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true);
     println("step 2: segory to heap sketch, to byte[]/segory & analyze segory. Should match above");
     println(s);
     assertEquals(compBytes, compBytes2);
@@ -655,13 +655,13 @@ public void checkMemoryToStringFloatCompact() {
     sk.update(1);
     compBytes = sk.toByteArray();
     wseg = MemorySegment.ofArray(compBytes);
-    s = KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true);
     println("step 1: sketch to byte[]/segory & analyze segory");
     println(s);
     sk2 = KllFloatsSketch.heapify(wseg);
     compBytes2 = sk2.toByteArray();
     wseg = MemorySegment.ofArray(compBytes2);
-    s = KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true);
     println("step 2: segory to heap sketch, to byte[]/segory & analyze segory. Should match above");
     println(s);
     assertEquals(compBytes, compBytes2);
@@ -682,13 +682,13 @@ public void checkMemoryToStringFloatUpdatable() {
     for (int i = 1; i <= (k + 1); i++) { sk.update(i); }
     upBytes = KllHelper.toByteArray(sk, true);
     wseg = MemorySegment.ofArray(upBytes);
-    s = KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true);
     println("step 1: sketch to byte[]/segory & analyze segory");
     println(s);
     sk2 = KllHeapFloatsSketch.heapifyImpl(wseg);
     upBytes2 = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(upBytes2);
-    s = KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true);
     println("step 2: segory to heap sketch, to byte[]/segory & analyze segory. Should match above");
     println(s); //note: heapify does not copy free space, while toUpdatableByteArray does
     assertEquals(sk.getN(), sk2.getN());
@@ -700,13 +700,13 @@ public void checkMemoryToStringFloatUpdatable() {
     sk = KllFloatsSketch.newHeapInstance(k);
     upBytes = KllHelper.toByteArray(sk, true);
     wseg = MemorySegment.ofArray(upBytes);
-    s = KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true);
     println("step 1: sketch to byte[]/segory & analyze segory");
     println(s);
     sk2 = KllHeapFloatsSketch.heapifyImpl(wseg);
     upBytes2 = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(upBytes2);
-    s = KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true);
     println("step 2: segory to heap sketch, to byte[]/segory & analyze segory. Should match above");
     println(s);
     assertEquals(upBytes, upBytes2);
@@ -716,13 +716,13 @@ public void checkMemoryToStringFloatUpdatable() {
     sk.update(1);
     upBytes = KllHelper.toByteArray(sk, true);
     wseg = MemorySegment.ofArray(upBytes);
-    s = KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true);
     println("step 1: sketch to byte[]/segory & analyze segory");
     println(s);
     sk2 = KllHeapFloatsSketch.heapifyImpl(wseg);
     upBytes2 = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(upBytes2);
-    s = KllPreambleUtil.toString(wseg, FLOATS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_FLOATS_SKETCH, true);
     println("step 2: segory to heap sketch, to byte[]/segory & analyze segory. Should match above");
     println(s);
     assertEquals(upBytes, upBytes2);
diff --git a/src/test/java/org/apache/datasketches/kll/KllMiscItemsTest.java b/src/test/java/org/apache/datasketches/kll/KllMiscItemsTest.java
index 89318d266..72a4acf47 100644
--- a/src/test/java/org/apache/datasketches/kll/KllMiscItemsTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllMiscItemsTest.java
@@ -22,7 +22,7 @@
 import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 import static org.apache.datasketches.common.Util.LS;
 import static org.apache.datasketches.common.Util.bitAt;
-import static org.apache.datasketches.kll.KllSketch.SketchType.ITEMS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_ITEMS_SKETCH;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.INCLUSIVE;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
@@ -367,7 +367,7 @@ public void checkSketchInitializeItemsHeapifyCompactMemorySegment() {
     println(sk2.toString(true, true));
     compBytes = sk2.toByteArray();
     seg = MemorySegment.ofArray(compBytes);
-    println(KllPreambleUtil.toString(seg, ITEMS_SKETCH, true, serDe));
+    println(KllPreambleUtil.toString(seg, KLL_ITEMS_SKETCH, true, serDe));
     sk = KllItemsSketch.heapify(seg, Comparator.naturalOrder(), serDe);
     assertEquals(sk.getK(), k);
     assertEquals(sk.getN(), k + 1);
@@ -387,7 +387,7 @@ public void checkSketchInitializeItemsHeapifyCompactMemorySegment() {
     //println(sk.toString(true, true));
     compBytes = sk2.toByteArray();
     seg = MemorySegment.ofArray(compBytes);
-    println(KllPreambleUtil.toString(seg, ITEMS_SKETCH, true, serDe));
+    println(KllPreambleUtil.toString(seg, KLL_ITEMS_SKETCH, true, serDe));
     sk = KllItemsSketch.heapify(seg, Comparator.naturalOrder(), serDe);
     assertEquals(sk.getK(), k);
     assertEquals(sk.getN(), 0);
@@ -408,7 +408,7 @@ public void checkSketchInitializeItemsHeapifyCompactMemorySegment() {
     //println(sk2.toString(true, true));
     compBytes = sk2.toByteArray();
     seg = MemorySegment.ofArray(compBytes);
-    println(KllPreambleUtil.toString(seg, ITEMS_SKETCH, true, serDe));
+    println(KllPreambleUtil.toString(seg, KLL_ITEMS_SKETCH, true, serDe));
     sk = KllItemsSketch.heapify(seg, Comparator.naturalOrder(), serDe);
     assertEquals(sk.getK(), k);
     assertEquals(sk.getN(), 1);
@@ -443,13 +443,13 @@ public void checkMemoryToStringItemsCompact() {
     for (int i = 1; i <= n; i++) { sk.update(Util.longToFixedLengthString(i, digits)); }
     compBytes = sk.toByteArray();
     seg = MemorySegment.ofArray(compBytes);
-    s = KllPreambleUtil.toString(seg, ITEMS_SKETCH, true, serDe);
+    s = KllPreambleUtil.toString(seg, KLL_ITEMS_SKETCH, true, serDe);
     println("step 1: sketch to byte[]/MemorySegment & analyze MemorySegment");
     println(s);
     sk2 = KllItemsSketch.heapify(seg, Comparator.naturalOrder(), serDe);
     compBytes2 = sk2.toByteArray();
     seg = MemorySegment.ofArray(compBytes2);
-    s = KllPreambleUtil.toString(seg, ITEMS_SKETCH, true, serDe);
+    s = KllPreambleUtil.toString(seg, KLL_ITEMS_SKETCH, true, serDe);
     println("step 2: MemorySegment to heap sketch, to byte[]/MemorySegment & analyze MemorySegment. Should match above");
     println(s);
     assertEquals(compBytes, compBytes2);
@@ -458,13 +458,13 @@ public void checkMemoryToStringItemsCompact() {
     sk = KllItemsSketch.newHeapInstance(k, Comparator.naturalOrder(), serDe);
     compBytes = sk.toByteArray();
     seg = MemorySegment.ofArray(compBytes);
-    s = KllPreambleUtil.toString(seg, ITEMS_SKETCH, true, serDe);
+    s = KllPreambleUtil.toString(seg, KLL_ITEMS_SKETCH, true, serDe);
     println("step 1: sketch to byte[]/MemorySegment & analyze MemorySegment");
     println(s);
     sk2 = KllItemsSketch.heapify(seg, Comparator.naturalOrder(), serDe);
     compBytes2 = sk2.toByteArray();
     seg = MemorySegment.ofArray(compBytes2);
-    s = KllPreambleUtil.toString(seg, ITEMS_SKETCH, true, serDe);
+    s = KllPreambleUtil.toString(seg, KLL_ITEMS_SKETCH, true, serDe);
     println("step 2: MemorySegment to heap sketch, to byte[]/MemorySegment & analyze MemorySegment. Should match above");
     println(s);
     assertEquals(compBytes, compBytes2);
@@ -474,13 +474,13 @@ public void checkMemoryToStringItemsCompact() {
     sk.update("1");
     compBytes = sk.toByteArray();
     seg = MemorySegment.ofArray(compBytes);
-    s = KllPreambleUtil.toString(seg, ITEMS_SKETCH, true, serDe);
+    s = KllPreambleUtil.toString(seg, KLL_ITEMS_SKETCH, true, serDe);
     println("step 1: sketch to byte[]/MemorySegment & analyze MemorySegment");
     println(s);
     sk2 = KllItemsSketch.heapify(seg, Comparator.naturalOrder(), serDe);
     compBytes2 = sk2.toByteArray();
     seg = MemorySegment.ofArray(compBytes2);
-    s = KllPreambleUtil.toString(seg, ITEMS_SKETCH, true, serDe);
+    s = KllPreambleUtil.toString(seg, KLL_ITEMS_SKETCH, true, serDe);
     println("step 2: MemorySegment to heap sketch, to byte[]/MemorySegment & analyze MemorySegment. Should match above");
     println(s);
     assertEquals(compBytes, compBytes2);
diff --git a/src/test/java/org/apache/datasketches/kll/KllMiscLongsTest.java b/src/test/java/org/apache/datasketches/kll/KllMiscLongsTest.java
index ecbe47882..0bf770445 100644
--- a/src/test/java/org/apache/datasketches/kll/KllMiscLongsTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllMiscLongsTest.java
@@ -22,7 +22,7 @@
 import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 import static org.apache.datasketches.common.Util.LS;
 import static org.apache.datasketches.common.Util.bitAt;
-import static org.apache.datasketches.kll.KllSketch.SketchType.LONGS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_LONGS_SKETCH;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.INCLUSIVE;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
@@ -203,7 +203,7 @@ public void viewDirectCompactions() {
     final boolean withLevels = false;
     final boolean withLevelsAndItems = true;
     int compaction = 0;
-    final int sizeBytes = KllSketch.getMaxSerializedSizeBytes(k, n, LONGS_SKETCH, true);
+    final int sizeBytes = KllSketch.getMaxSerializedSizeBytes(k, n, KLL_LONGS_SKETCH, true);
     final MemorySegment wseg = MemorySegment.ofArray(new byte[sizeBytes]);
     final KllLongsSketch sk = KllLongsSketch.newDirectInstance(k, wseg, null);
     for (int i = 1; i <= n; i++) {
@@ -482,7 +482,7 @@ public void checkSketchInitializeLongHeapifyCompactMemorySegment() {
     //println(sk2.toString(true, true));
     compBytes = sk2.toByteArray();
     wseg = MemorySegment.ofArray(compBytes);
-    println(KllPreambleUtil.toString(wseg, LONGS_SKETCH, true));
+    println(KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true));
     sk = KllLongsSketch.heapify(wseg);
     assertEquals(sk.getK(), k);
     assertEquals(sk.getN(), k + 1);
@@ -552,7 +552,7 @@ public void checkSketchInitializeLongHeapifyUpdatableMemorySegment() {
     for (int i = 1; i <= (k + 1); i++) { sk2.update(i); }
     compBytes = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(compBytes);
-    println(KllPreambleUtil.toString(wseg, LONGS_SKETCH, true));
+    println(KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true));
     sk = KllHeapLongsSketch.heapifyImpl(wseg);
     assertEquals(sk.getK(), k);
     assertEquals(sk.getN(), k + 1);
@@ -624,13 +624,13 @@ public void checkMemoryToStringLongCompact() {
     for (int i = 1; i <= (k + 1); i++) { sk.update(i); }
     compBytes = sk.toByteArray();
     wseg = MemorySegment.ofArray(compBytes);
-    s = KllPreambleUtil.toString(wseg, LONGS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true);
     println("step 1: sketch to byte[]/segory & analyze segory");
     println(s);
     sk2 = KllLongsSketch.heapify(wseg);
     compBytes2 = sk2.toByteArray();
     wseg = MemorySegment.ofArray(compBytes2);
-    s = KllPreambleUtil.toString(wseg, LONGS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true);
     println("step 2: segory to heap sketch, to byte[]/segory & analyze segory. Should match above");
     println(s);
     assertEquals(compBytes, compBytes2);
@@ -639,13 +639,13 @@ public void checkMemoryToStringLongCompact() {
     sk = KllLongsSketch.newHeapInstance(k);
     compBytes = sk.toByteArray();
     wseg = MemorySegment.ofArray(compBytes);
-    s = KllPreambleUtil.toString(wseg, LONGS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true);
     println("step 1: sketch to byte[]/segory & analyze segory");
     println(s);
     sk2 = KllLongsSketch.heapify(wseg);
     compBytes2 = sk2.toByteArray();
     wseg = MemorySegment.ofArray(compBytes2);
-    s = KllPreambleUtil.toString(wseg, LONGS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true);
     println("step 2: segory to heap sketch, to byte[]/segory & analyze segory. Should match above");
     println(s);
     assertEquals(compBytes, compBytes2);
@@ -655,13 +655,13 @@ public void checkMemoryToStringLongCompact() {
     sk.update(1);
     compBytes = sk.toByteArray();
     wseg = MemorySegment.ofArray(compBytes);
-    s = KllPreambleUtil.toString(wseg, LONGS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true);
     println("step 1: sketch to byte[]/segory & analyze segory");
     println(s);
     sk2 = KllLongsSketch.heapify(wseg);
     compBytes2 = sk2.toByteArray();
     wseg = MemorySegment.ofArray(compBytes2);
-    s = KllPreambleUtil.toString(wseg, LONGS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true);
     println("step 2: segory to heap sketch, to byte[]/segory & analyze segory. Should match above");
     println(s);
     assertEquals(compBytes, compBytes2);
@@ -682,13 +682,13 @@ public void checkMemoryToStringLongUpdatable() {
     for (int i = 1; i <= (k + 1); i++) { sk.update(i); }
     upBytes = KllHelper.toByteArray(sk, true);
     wseg = MemorySegment.ofArray(upBytes);
-    s = KllPreambleUtil.toString(wseg, LONGS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true);
     println("step 1: sketch to byte[]/segory & analyze segory");
     println(s);
     sk2 = KllHeapLongsSketch.heapifyImpl(wseg);
     upBytes2 = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(upBytes2);
-    s = KllPreambleUtil.toString(wseg, LONGS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true);
     println("step 2: segory to heap sketch, to byte[]/segory & analyze segory. Should match above");
     println(s); //note: heapify does not copy free space, while toUpdatableByteArray does
     assertEquals(sk.getN(), sk2.getN());
@@ -700,13 +700,13 @@ public void checkMemoryToStringLongUpdatable() {
     sk = KllLongsSketch.newHeapInstance(k);
     upBytes = KllHelper.toByteArray(sk, true);
     wseg = MemorySegment.ofArray(upBytes);
-    s = KllPreambleUtil.toString(wseg, LONGS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true);
     println("step 1: sketch to byte[]/segory & analyze segory");
     println(s);
     sk2 = KllHeapLongsSketch.heapifyImpl(wseg);
     upBytes2 = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(upBytes2);
-    s = KllPreambleUtil.toString(wseg, LONGS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true);
     println("step 2: segory to heap sketch, to byte[]/segory & analyze segory. Should match above");
     println(s);
     assertEquals(upBytes, upBytes2);
@@ -716,13 +716,13 @@ public void checkMemoryToStringLongUpdatable() {
     sk.update(1);
     upBytes = KllHelper.toByteArray(sk, true);
     wseg = MemorySegment.ofArray(upBytes);
-    s = KllPreambleUtil.toString(wseg, LONGS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true);
     println("step 1: sketch to byte[]/segory & analyze segory");
     println(s);
     sk2 = KllHeapLongsSketch.heapifyImpl(wseg);
     upBytes2 = KllHelper.toByteArray(sk2, true);
     wseg = MemorySegment.ofArray(upBytes2);
-    s = KllPreambleUtil.toString(wseg, LONGS_SKETCH, true);
+    s = KllPreambleUtil.toString(wseg, KLL_LONGS_SKETCH, true);
     println("step 2: segory to heap sketch, to byte[]/segory & analyze segory. Should match above");
     println(s);
     assertEquals(upBytes, upBytes2);

From 9f6afa4e6e1930a97bc40e1d898dfdbb45361b97 Mon Sep 17 00:00:00 2001
From: Lee Rhodes 
Date: Thu, 16 Oct 2025 13:37:59 -0700
Subject: [PATCH 7/7] Fix Unused variables in test.

---
 .../kll/KllMemoryValidateTest.java            | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/test/java/org/apache/datasketches/kll/KllMemoryValidateTest.java b/src/test/java/org/apache/datasketches/kll/KllMemoryValidateTest.java
index 73468d439..581dc4108 100644
--- a/src/test/java/org/apache/datasketches/kll/KllMemoryValidateTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllMemoryValidateTest.java
@@ -34,13 +34,8 @@
 
 import org.apache.datasketches.common.Family;
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllDoublesSketch;
-import org.apache.datasketches.kll.KllFloatsSketch;
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllMemorySegmentValidate;
 import org.testng.annotations.Test;
 
-@SuppressWarnings("unused")
 public class KllMemoryValidateTest {
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -49,7 +44,7 @@ public void checkInvalidFamily() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentFamilyID(wseg, Family.KLL.getID() - 1);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
+    new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -58,7 +53,7 @@ public void checkInvalidSerVer() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentSerVer(wseg, SERIAL_VERSION_EMPTY_FULL - 1);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
+    new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -68,7 +63,7 @@ public void checkInvalidEmptyAndSingleFormat() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentEmptyFlag(wseg, true);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
+    new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -77,7 +72,7 @@ public void checkInvalidUpdatableAndSerVer() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentSerVer(wseg, SERIAL_VERSION_SINGLE);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
+    new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -87,7 +82,7 @@ public void checkInvalidSingleAndPreInts() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentPreInts(wseg, PREAMBLE_INTS_FULL);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
+    new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -97,7 +92,7 @@ public void checkInvalidSingleAndSerVer() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentSerVer(wseg, SERIAL_VERSION_EMPTY_FULL);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
+    new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -106,7 +101,7 @@ public void checkInvalidEmptyDoublesAndPreIntsFull() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentPreInts(wseg, PREAMBLE_INTS_FULL);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_DOUBLES_SKETCH);
+    new KllMemorySegmentValidate(wseg, KLL_DOUBLES_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -116,7 +111,7 @@ public void checkInvalidSingleDoubleCompactAndSerVer() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentSerVer(wseg, SERIAL_VERSION_EMPTY_FULL);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_DOUBLES_SKETCH);
+    new KllMemorySegmentValidate(wseg, KLL_DOUBLES_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -125,7 +120,7 @@ public void checkInvalidDoubleUpdatableAndPreInts() {
     final byte[] byteArr = KllHelper.toByteArray(sk, true);
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentPreInts(wseg, PREAMBLE_INTS_EMPTY_SINGLE);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_DOUBLES_SKETCH);
+    new KllMemorySegmentValidate(wseg, KLL_DOUBLES_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -135,7 +130,7 @@ public void checkInvalidFloatFullAndPreInts() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentPreInts(wseg, PREAMBLE_INTS_EMPTY_SINGLE);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
+    new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -145,7 +140,7 @@ public void checkInvalidFloatUpdatableFullAndPreInts() {
     final byte[] byteArr = KllHelper.toByteArray(sk, true);
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentPreInts(wseg, PREAMBLE_INTS_EMPTY_SINGLE);
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
+    new KllMemorySegmentValidate(wseg, KLL_FLOATS_SKETCH);
   }
 
   @Test(expectedExceptions = SketchesArgumentException.class)
@@ -155,7 +150,7 @@ public void checkInvalidDoubleCompactSingleAndPreInts() {
     final byte[] byteArr = sk.toByteArray();
     final MemorySegment wseg = MemorySegment.ofArray(byteArr);
     setMemorySegmentPreInts(wseg, PREAMBLE_INTS_FULL);//should be 2, single
-    final KllMemorySegmentValidate segVal = new KllMemorySegmentValidate(wseg, KLL_DOUBLES_SKETCH);
+    new KllMemorySegmentValidate(wseg, KLL_DOUBLES_SKETCH);
   }
 
 }