You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2019/06/14 02:05:23 UTC

[incubator-datasketches-java] branch LicenseSwap created (now 5a83f38)

This is an automated email from the ASF dual-hosted git repository.

leerho pushed a change to branch LicenseSwap
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-java.git.


      at 5a83f38  License Swap + integration of cobertura / coveralls, .travis.yml

This branch includes the following new commits:

     new 5a83f38  License Swap + integration of cobertura / coveralls, .travis.yml

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org


[incubator-datasketches-java] 01/01: License Swap + integration of cobertura / coveralls, .travis.yml

Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

leerho pushed a commit to branch LicenseSwap
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-java.git

commit 5a83f3876dae320213cfc0ca32e17eb950563cfc
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Thu Jun 13 19:05:03 2019 -0700

    License Swap + integration of cobertura / coveralls, .travis.yml
---
 .travis.yml                                        |  23 +++-
 pom.xml                                            | 149 ++++++++++-----------
 .../com/yahoo/sketches/ArrayOfBooleansSerDe.java   |  18 ++-
 .../com/yahoo/sketches/ArrayOfDoublesSerDe.java    |  18 ++-
 .../java/com/yahoo/sketches/ArrayOfItemsSerDe.java |  18 ++-
 .../java/com/yahoo/sketches/ArrayOfLongsSerDe.java |  18 ++-
 .../com/yahoo/sketches/ArrayOfNumbersSerDe.java    |  18 ++-
 .../com/yahoo/sketches/ArrayOfStringsSerDe.java    |  18 ++-
 .../yahoo/sketches/ArrayOfUtf16StringsSerDe.java   |  18 ++-
 .../java/com/yahoo/sketches/BinomialBoundsN.java   |  18 ++-
 .../sketches/BoundsOnBinomialProportions.java      |  18 ++-
 .../sketches/BoundsOnRatiosInSampledSets.java      |  18 ++-
 .../BoundsOnRatiosInThetaSketchedSets.java         |  18 ++-
 .../java/com/yahoo/sketches/ByteArrayUtil.java     |  19 +++
 src/main/java/com/yahoo/sketches/EquivTables.java  |  18 ++-
 src/main/java/com/yahoo/sketches/Family.java       |  18 ++-
 .../java/com/yahoo/sketches/HashOperations.java    |  18 ++-
 .../java/com/yahoo/sketches/QuantilesHelper.java   |  18 ++-
 src/main/java/com/yahoo/sketches/QuickSelect.java  |  18 ++-
 src/main/java/com/yahoo/sketches/ResizeFactor.java |  18 ++-
 .../yahoo/sketches/SketchesArgumentException.java  |  18 ++-
 .../java/com/yahoo/sketches/SketchesException.java |  18 ++-
 .../yahoo/sketches/SketchesReadOnlyException.java  |  18 ++-
 .../com/yahoo/sketches/SketchesStateException.java |  18 ++-
 src/main/java/com/yahoo/sketches/Util.java         |  18 ++-
 .../com/yahoo/sketches/cpc/CompressedState.java    |  18 ++-
 .../com/yahoo/sketches/cpc/CompressionData.java    |  18 ++-
 .../com/yahoo/sketches/cpc/CpcCompression.java     |  18 ++-
 .../java/com/yahoo/sketches/cpc/CpcConfidence.java |  18 ++-
 .../java/com/yahoo/sketches/cpc/CpcSketch.java     |  18 ++-
 src/main/java/com/yahoo/sketches/cpc/CpcUnion.java |  18 ++-
 src/main/java/com/yahoo/sketches/cpc/CpcUtil.java  |  18 ++-
 .../java/com/yahoo/sketches/cpc/CpcWrapper.java    |  18 ++-
 src/main/java/com/yahoo/sketches/cpc/Flavor.java   |  18 ++-
 src/main/java/com/yahoo/sketches/cpc/Format.java   |  18 ++-
 .../java/com/yahoo/sketches/cpc/IconEstimator.java |  18 ++-
 .../sketches/cpc/IconPolynomialCoefficients.java   |  18 ++-
 .../java/com/yahoo/sketches/cpc/PairTable.java     |  18 ++-
 .../java/com/yahoo/sketches/cpc/PreambleUtil.java  |  18 ++-
 .../com/yahoo/sketches/cpc/RuntimeAsserts.java     |  18 ++-
 .../java/com/yahoo/sketches/cpc/package-info.java  |  18 ++-
 .../java/com/yahoo/sketches/fdt/FdtSketch.java     |  18 ++-
 src/main/java/com/yahoo/sketches/fdt/Group.java    |  18 ++-
 .../java/com/yahoo/sketches/fdt/PostProcessor.java |  18 ++-
 .../java/com/yahoo/sketches/fdt/package-info.java  |  18 ++-
 .../com/yahoo/sketches/frequencies/ErrorType.java  |  18 ++-
 .../yahoo/sketches/frequencies/ItemsSketch.java    |  18 ++-
 .../yahoo/sketches/frequencies/LongsSketch.java    |  18 ++-
 .../yahoo/sketches/frequencies/PreambleUtil.java   |  18 ++-
 .../frequencies/ReversePurgeItemHashMap.java       |  18 ++-
 .../frequencies/ReversePurgeLongHashMap.java       |  18 ++-
 .../java/com/yahoo/sketches/frequencies/Util.java  |  18 ++-
 .../yahoo/sketches/frequencies/package-info.java   |  19 ++-
 .../java/com/yahoo/sketches/hash/MurmurHash3.java  |  18 ++-
 .../yahoo/sketches/hash/MurmurHash3Adaptor.java    |  18 ++-
 .../com/yahoo/sketches/hash/MurmurHash3v2.java     |  18 ++-
 src/main/java/com/yahoo/sketches/hash/XxHash.java  |  18 ++-
 .../java/com/yahoo/sketches/hash/package-info.java |  18 ++-
 .../com/yahoo/sketches/hll/AbstractCoupons.java    |  18 ++-
 .../com/yahoo/sketches/hll/AbstractHllArray.java   |  18 ++-
 .../java/com/yahoo/sketches/hll/AuxHashMap.java    |  18 ++-
 .../java/com/yahoo/sketches/hll/BaseHllSketch.java |  18 ++-
 .../sketches/hll/CompositeInterpolationXTable.java |  18 ++-
 .../java/com/yahoo/sketches/hll/Conversions.java   |  18 ++-
 .../java/com/yahoo/sketches/hll/CouponHashSet.java |  18 ++-
 .../java/com/yahoo/sketches/hll/CouponList.java    |  18 ++-
 .../java/com/yahoo/sketches/hll/CouponMapping.java |  18 ++-
 .../com/yahoo/sketches/hll/CubicInterpolation.java |  19 +++
 src/main/java/com/yahoo/sketches/hll/CurMode.java  |  18 ++-
 .../com/yahoo/sketches/hll/DirectAuxHashMap.java   |  18 ++-
 .../yahoo/sketches/hll/DirectCouponHashSet.java    |  18 ++-
 .../com/yahoo/sketches/hll/DirectCouponList.java   |  18 ++-
 .../com/yahoo/sketches/hll/DirectHll4Array.java    |  18 ++-
 .../com/yahoo/sketches/hll/DirectHll6Array.java    |  18 ++-
 .../com/yahoo/sketches/hll/DirectHll8Array.java    |  18 ++-
 .../com/yahoo/sketches/hll/DirectHllArray.java     |  18 ++-
 .../com/yahoo/sketches/hll/HarmonicNumbers.java    |  18 ++-
 .../com/yahoo/sketches/hll/HeapAuxHashMap.java     |  18 ++-
 .../java/com/yahoo/sketches/hll/Hll4Array.java     |  18 ++-
 .../java/com/yahoo/sketches/hll/Hll4Update.java    |  18 ++-
 .../java/com/yahoo/sketches/hll/Hll6Array.java     |  18 ++-
 .../java/com/yahoo/sketches/hll/Hll8Array.java     |  18 ++-
 src/main/java/com/yahoo/sketches/hll/HllArray.java |  18 ++-
 .../java/com/yahoo/sketches/hll/HllEstimators.java |  18 ++-
 .../com/yahoo/sketches/hll/HllPairIterator.java    |  18 ++-
 .../java/com/yahoo/sketches/hll/HllSketch.java     |  18 ++-
 .../java/com/yahoo/sketches/hll/HllSketchImpl.java |  18 ++-
 src/main/java/com/yahoo/sketches/hll/HllUtil.java  |  18 ++-
 .../yahoo/sketches/hll/IntArrayPairIterator.java   |  18 ++-
 .../yahoo/sketches/hll/IntMemoryPairIterator.java  |  18 ++-
 .../java/com/yahoo/sketches/hll/PairIterator.java  |  18 ++-
 .../java/com/yahoo/sketches/hll/PreambleUtil.java  |  18 ++-
 .../yahoo/sketches/hll/RelativeErrorTables.java    |  18 ++-
 .../java/com/yahoo/sketches/hll/TgtHllType.java    |  18 ++-
 .../com/yahoo/sketches/hll/ToByteArrayImpl.java    |  18 ++-
 src/main/java/com/yahoo/sketches/hll/Union.java    |  18 ++-
 .../java/com/yahoo/sketches/hll/package-info.java  |  18 ++-
 .../com/yahoo/sketches/hllmap/CouponHashMap.java   |  18 ++-
 .../yahoo/sketches/hllmap/CouponTraverseMap.java   |  18 ++-
 .../com/yahoo/sketches/hllmap/CouponsIterator.java |  18 ++-
 .../java/com/yahoo/sketches/hllmap/HllMap.java     |  18 ++-
 src/main/java/com/yahoo/sketches/hllmap/Map.java   |  18 ++-
 .../com/yahoo/sketches/hllmap/SingleCouponMap.java |  18 ++-
 .../com/yahoo/sketches/hllmap/UniqueCountMap.java  |  18 ++-
 .../com/yahoo/sketches/hllmap/package-info.java    |  18 ++-
 .../sketches/kll/KllFloatsQuantileCalculator.java  |  18 ++-
 .../com/yahoo/sketches/kll/KllFloatsSketch.java    |  18 ++-
 .../sketches/kll/KllFloatsSketchIterator.java      |  19 +++
 .../java/com/yahoo/sketches/kll/KllHelper.java     |  18 ++-
 .../java/com/yahoo/sketches/kll/package-info.java  |  18 ++-
 src/main/java/com/yahoo/sketches/package-info.java |  19 ++-
 .../sketches/quantiles/CompactDoublesSketch.java   |  18 ++-
 .../quantiles/DirectCompactDoublesSketch.java      |  18 ++-
 .../quantiles/DirectDoublesSketchAccessor.java     |  18 ++-
 .../quantiles/DirectUpdateDoublesSketch.java       |  18 ++-
 .../quantiles/DirectUpdateDoublesSketchR.java      |  18 ++-
 .../sketches/quantiles/DoublesArrayAccessor.java   |  18 ++-
 .../yahoo/sketches/quantiles/DoublesAuxiliary.java |  18 ++-
 .../sketches/quantiles/DoublesBufferAccessor.java  |  18 ++-
 .../sketches/quantiles/DoublesByteArrayImpl.java   |  18 ++-
 .../yahoo/sketches/quantiles/DoublesMergeImpl.java |  18 ++-
 .../sketches/quantiles/DoublesPmfCdfImpl.java      |  18 ++-
 .../yahoo/sketches/quantiles/DoublesSketch.java    |  18 ++-
 .../sketches/quantiles/DoublesSketchAccessor.java  |  18 ++-
 .../sketches/quantiles/DoublesSketchBuilder.java   |  18 ++-
 .../sketches/quantiles/DoublesSketchIterator.java  |  18 ++-
 .../com/yahoo/sketches/quantiles/DoublesUnion.java |  18 ++-
 .../sketches/quantiles/DoublesUnionBuilder.java    |  18 ++-
 .../yahoo/sketches/quantiles/DoublesUnionImpl.java |  18 ++-
 .../sketches/quantiles/DoublesUnionImplR.java      |  18 ++-
 .../sketches/quantiles/DoublesUpdateImpl.java      |  18 ++-
 .../com/yahoo/sketches/quantiles/DoublesUtil.java  |  18 ++-
 .../quantiles/HeapCompactDoublesSketch.java        |  18 ++-
 .../quantiles/HeapDoublesSketchAccessor.java       |  18 ++-
 .../quantiles/HeapUpdateDoublesSketch.java         |  18 ++-
 .../yahoo/sketches/quantiles/ItemsAuxiliary.java   |  18 ++-
 .../sketches/quantiles/ItemsByteArrayImpl.java     |  18 ++-
 .../yahoo/sketches/quantiles/ItemsMergeImpl.java   |  18 ++-
 .../yahoo/sketches/quantiles/ItemsPmfCdfImpl.java  |  18 ++-
 .../com/yahoo/sketches/quantiles/ItemsSketch.java  |  18 ++-
 .../sketches/quantiles/ItemsSketchIterator.java    |  18 ++-
 .../com/yahoo/sketches/quantiles/ItemsUnion.java   |  18 ++-
 .../yahoo/sketches/quantiles/ItemsUpdateImpl.java  |  18 ++-
 .../com/yahoo/sketches/quantiles/ItemsUtil.java    |  18 ++-
 .../com/yahoo/sketches/quantiles/PreambleUtil.java |  18 ++-
 .../sketches/quantiles/UpdateDoublesSketch.java    |  18 ++-
 .../java/com/yahoo/sketches/quantiles/Util.java    |  18 ++-
 .../com/yahoo/sketches/quantiles/package-info.java |  18 ++-
 .../com/yahoo/sketches/sampling/PreambleUtil.java  |  18 ++-
 .../sketches/sampling/ReservoirItemsSketch.java    |  18 ++-
 .../sketches/sampling/ReservoirItemsUnion.java     |  18 ++-
 .../sketches/sampling/ReservoirLongsSketch.java    |  18 ++-
 .../sketches/sampling/ReservoirLongsUnion.java     |  18 ++-
 .../com/yahoo/sketches/sampling/ReservoirSize.java |  18 ++-
 .../sketches/sampling/SampleSubsetSummary.java     |  19 +++
 .../com/yahoo/sketches/sampling/SamplingUtil.java  |  18 ++-
 .../sketches/sampling/VarOptItemsSamples.java      |  18 ++-
 .../yahoo/sketches/sampling/VarOptItemsSketch.java |  18 ++-
 .../yahoo/sketches/sampling/VarOptItemsUnion.java  |  18 ++-
 .../com/yahoo/sketches/sampling/package-info.java  |  19 ++-
 src/main/java/com/yahoo/sketches/theta/AnotB.java  |  18 ++-
 .../com/yahoo/sketches/theta/CompactSketch.java    |  18 ++-
 .../ConcurrentBackgroundThetaPropagation.java      |  18 ++-
 .../theta/ConcurrentDirectQuickSelectSketch.java   |  18 ++-
 .../theta/ConcurrentHeapQuickSelectSketch.java     |  18 ++-
 .../sketches/theta/ConcurrentHeapThetaBuffer.java  |  18 ++-
 .../theta/ConcurrentPropagationService.java        |  19 +++
 .../theta/ConcurrentSharedThetaSketch.java         |  18 ++-
 .../sketches/theta/DirectCompactOrderedSketch.java |  18 ++-
 .../yahoo/sketches/theta/DirectCompactSketch.java  |  18 ++-
 .../theta/DirectCompactUnorderedSketch.java        |  18 ++-
 .../sketches/theta/DirectQuickSelectSketch.java    |  18 ++-
 .../sketches/theta/DirectQuickSelectSketchR.java   |  18 ++-
 .../yahoo/sketches/theta/ForwardCompatibility.java |  18 ++-
 .../com/yahoo/sketches/theta/HashIterator.java     |  18 ++-
 .../com/yahoo/sketches/theta/HeapAlphaSketch.java  |  18 ++-
 .../java/com/yahoo/sketches/theta/HeapAnotB.java   |  18 ++-
 .../sketches/theta/HeapCompactOrderedSketch.java   |  18 ++-
 .../yahoo/sketches/theta/HeapCompactSketch.java    |  18 ++-
 .../sketches/theta/HeapCompactUnorderedSketch.java |  18 ++-
 .../com/yahoo/sketches/theta/HeapHashIterator.java |  18 ++-
 .../sketches/theta/HeapQuickSelectSketch.java      |  18 ++-
 .../com/yahoo/sketches/theta/HeapUpdateSketch.java |  18 ++-
 .../com/yahoo/sketches/theta/Intersection.java     |  18 ++-
 .../com/yahoo/sketches/theta/IntersectionImpl.java |  18 ++-
 .../yahoo/sketches/theta/IntersectionImplR.java    |  18 ++-
 .../yahoo/sketches/theta/JaccardSimilarity.java    |  18 ++-
 .../yahoo/sketches/theta/MemoryHashIterator.java   |  18 ++-
 .../sketches/theta/PairwiseSetOperations.java      |  18 ++-
 .../com/yahoo/sketches/theta/PreambleUtil.java     |  18 ++-
 .../java/com/yahoo/sketches/theta/Rebuilder.java   |  18 ++-
 .../com/yahoo/sketches/theta/SetOperation.java     |  18 ++-
 .../yahoo/sketches/theta/SetOperationBuilder.java  |  18 ++-
 .../com/yahoo/sketches/theta/SingleItemSketch.java |  18 ++-
 src/main/java/com/yahoo/sketches/theta/Sketch.java |  18 ++-
 .../java/com/yahoo/sketches/theta/Sketches.java    |  18 ++-
 src/main/java/com/yahoo/sketches/theta/Union.java  |  18 ++-
 .../java/com/yahoo/sketches/theta/UnionImpl.java   |  18 ++-
 .../yahoo/sketches/theta/UpdateReturnState.java    |  18 ++-
 .../com/yahoo/sketches/theta/UpdateSketch.java     |  18 ++-
 .../yahoo/sketches/theta/UpdateSketchBuilder.java  |  18 ++-
 .../com/yahoo/sketches/theta/package-info.java     |  18 ++-
 src/main/java/com/yahoo/sketches/tuple/AnotB.java  |  18 ++-
 .../yahoo/sketches/tuple/ArrayOfDoublesAnotB.java  |  18 ++-
 .../sketches/tuple/ArrayOfDoublesCombiner.java     |  18 ++-
 .../tuple/ArrayOfDoublesCompactSketch.java         |  18 ++-
 .../sketches/tuple/ArrayOfDoublesIntersection.java |  18 ++-
 .../tuple/ArrayOfDoublesQuickSelectSketch.java     |  18 ++-
 .../tuple/ArrayOfDoublesSetOperationBuilder.java   |  18 ++-
 .../yahoo/sketches/tuple/ArrayOfDoublesSketch.java |  18 ++-
 .../tuple/ArrayOfDoublesSketchIterator.java        |  18 ++-
 .../sketches/tuple/ArrayOfDoublesSketches.java     |  18 ++-
 .../yahoo/sketches/tuple/ArrayOfDoublesUnion.java  |  18 ++-
 .../tuple/ArrayOfDoublesUpdatableSketch.java       |  18 ++-
 .../ArrayOfDoublesUpdatableSketchBuilder.java      |  18 ++-
 .../com/yahoo/sketches/tuple/CompactSketch.java    |  18 ++-
 .../yahoo/sketches/tuple/DeserializeResult.java    |  18 ++-
 .../tuple/DirectArrayOfDoublesCompactSketch.java   |  18 ++-
 .../tuple/DirectArrayOfDoublesIntersection.java    |  18 ++-
 .../DirectArrayOfDoublesQuickSelectSketch.java     |  18 ++-
 .../DirectArrayOfDoublesQuickSelectSketchR.java    |  19 +++
 .../tuple/DirectArrayOfDoublesSketchIterator.java  |  18 ++-
 .../sketches/tuple/DirectArrayOfDoublesUnion.java  |  18 ++-
 .../sketches/tuple/DirectArrayOfDoublesUnionR.java |  19 +++
 src/main/java/com/yahoo/sketches/tuple/Filter.java |  19 +++
 .../sketches/tuple/HeapArrayOfDoublesAnotB.java    |  18 ++-
 .../tuple/HeapArrayOfDoublesCompactSketch.java     |  18 ++-
 .../tuple/HeapArrayOfDoublesIntersection.java      |  18 ++-
 .../tuple/HeapArrayOfDoublesQuickSelectSketch.java |  18 ++-
 .../tuple/HeapArrayOfDoublesSketchIterator.java    |  18 ++-
 .../sketches/tuple/HeapArrayOfDoublesUnion.java    |  18 ++-
 .../com/yahoo/sketches/tuple/Intersection.java     |  18 ++-
 .../yahoo/sketches/tuple/QuickSelectSketch.java    |  18 ++-
 .../sketches/tuple/SerializerDeserializer.java     |  18 ++-
 src/main/java/com/yahoo/sketches/tuple/Sketch.java |  18 ++-
 .../com/yahoo/sketches/tuple/SketchIterator.java   |  18 ++-
 .../java/com/yahoo/sketches/tuple/Sketches.java    |  18 ++-
 .../java/com/yahoo/sketches/tuple/Summary.java     |  18 ++-
 .../yahoo/sketches/tuple/SummaryDeserializer.java  |  19 +++
 .../com/yahoo/sketches/tuple/SummaryFactory.java   |  18 ++-
 .../yahoo/sketches/tuple/SummarySetOperations.java |  18 ++-
 src/main/java/com/yahoo/sketches/tuple/Union.java  |  18 ++-
 .../com/yahoo/sketches/tuple/UpdatableSketch.java  |  18 ++-
 .../sketches/tuple/UpdatableSketchBuilder.java     |  18 ++-
 .../com/yahoo/sketches/tuple/UpdatableSummary.java |  18 ++-
 src/main/java/com/yahoo/sketches/tuple/Util.java   |  18 ++-
 .../sketches/tuple/adouble/DoubleSummary.java      |  18 ++-
 .../tuple/adouble/DoubleSummaryDeserializer.java   |  19 +++
 .../tuple/adouble/DoubleSummaryFactory.java        |  18 ++-
 .../tuple/adouble/DoubleSummarySetOperations.java  |  18 ++-
 .../yahoo/sketches/tuple/adouble/package-info.java |  18 ++-
 .../com/yahoo/sketches/tuple/package-info.java     |  18 ++-
 .../tuple/strings/ArrayOfStringsSketch.java        |  18 ++-
 .../tuple/strings/ArrayOfStringsSummary.java       |  18 ++-
 .../strings/ArrayOfStringsSummaryDeserializer.java |  18 ++-
 .../strings/ArrayOfStringsSummaryFactory.java      |  18 ++-
 .../ArrayOfStringsSummarySetOperations.java        |  18 ++-
 .../yahoo/sketches/tuple/strings/package-info.java |  18 ++-
 .../com/yahoo/sketches/BinomialBoundsNTest.java    |  18 ++-
 .../sketches/BoundsOnBinomialProportionsTest.java  |  19 ++-
 .../sketches/BoundsOnRatiosInSampledSetsTest.java  |  18 ++-
 .../BoundsOnRatiosInThetaSketchedSetsTest.java     |  18 ++-
 .../java/com/yahoo/sketches/ByteArrayUtilTest.java |  18 ++-
 src/test/java/com/yahoo/sketches/FamilyTest.java   |  19 ++-
 .../com/yahoo/sketches/HashOperationsTest.java     |  19 ++-
 .../java/com/yahoo/sketches/QuickSelectTest.java   |  19 ++-
 .../com/yahoo/sketches/SketchesExceptionTest.java  |  18 ++-
 src/test/java/com/yahoo/sketches/UtilTest.java     |  19 ++-
 .../java/com/yahoo/sketches/cpc/BitMatrix.java     |  18 ++-
 .../yahoo/sketches/cpc/CompressedStateTest.java    |  18 ++-
 .../sketches/cpc/CompressionCharacterization.java  |  18 ++-
 .../yahoo/sketches/cpc/CompressionDataTest.java    |  18 ++-
 .../com/yahoo/sketches/cpc/CpcCBinariesTest.java   |  18 ++-
 .../com/yahoo/sketches/cpc/CpcCompressionTest.java |  18 ++-
 .../java/com/yahoo/sketches/cpc/CpcSketchTest.java |  18 ++-
 .../java/com/yahoo/sketches/cpc/CpcUnionTest.java  |  18 ++-
 .../com/yahoo/sketches/cpc/CpcWrapperTest.java     |  18 ++-
 .../com/yahoo/sketches/cpc/IconEstimatorTest.java  |  18 ++-
 .../com/yahoo/sketches/cpc/LzTzSpeedTesting.java   |  18 ++-
 .../com/yahoo/sketches/cpc/MergingValidation.java  |  18 ++-
 .../java/com/yahoo/sketches/cpc/PairTableTest.java |  18 ++-
 .../com/yahoo/sketches/cpc/PreambleUtilTest.java   |  18 ++-
 .../yahoo/sketches/cpc/QuickMergingValidation.java |  18 ++-
 .../com/yahoo/sketches/cpc/RuntimeAssertsTest.java |  18 ++-
 .../yahoo/sketches/cpc/SpecialCBinariesTest.java   |  18 ++-
 .../yahoo/sketches/cpc/StreamingValidation.java    |  18 ++-
 .../java/com/yahoo/sketches/cpc/TestAllTest.java   |  18 ++-
 src/test/java/com/yahoo/sketches/cpc/TestUtil.java |  18 ++-
 .../java/com/yahoo/sketches/fdt/FdtSketchTest.java |  18 ++-
 .../java/com/yahoo/sketches/fdt/GroupTest.java     |  18 ++-
 .../com/yahoo/sketches/frequencies/DistTest.java   |  18 ++-
 .../sketches/frequencies/ItemsSketchTest.java      |  18 ++-
 .../sketches/frequencies/LongsSketchTest.java      |  18 ++-
 .../frequencies/ReversePurgeLongHashMapTest.java   |  18 ++-
 .../frequencies/SerDeCompatibilityTest.java        |  18 ++-
 .../sketches/frequencies/StressTestHashMap.java    |  18 ++-
 .../sketches/hash/MurmurHash3AdaptorTest.java      |  19 ++-
 .../com/yahoo/sketches/hash/MurmurHash3Test.java   |  19 ++-
 .../com/yahoo/sketches/hash/MurmurHash3v2Test.java |  18 ++-
 .../java/com/yahoo/sketches/hash/XxHashTest.java   |  18 ++-
 .../com/yahoo/sketches/hll/AuxHashMapTest.java     |  18 ++-
 .../com/yahoo/sketches/hll/BaseHllSketchTest.java  |  18 ++-
 .../com/yahoo/sketches/hll/CouponListTest.java     |  18 ++-
 .../com/yahoo/sketches/hll/CrossCountingTest.java  |  18 ++-
 .../yahoo/sketches/hll/DirectAuxHashMapTest.java   |  18 ++-
 .../yahoo/sketches/hll/DirectCouponListTest.java   |  18 ++-
 .../yahoo/sketches/hll/DirectHllSketchTest.java    |  18 ++-
 .../yahoo/sketches/hll/DirectUnionCaseTest.java    |  18 ++-
 .../com/yahoo/sketches/hll/DirectUnionTest.java    |  18 ++-
 .../java/com/yahoo/sketches/hll/HllArrayTest.java  |  18 ++-
 .../java/com/yahoo/sketches/hll/HllSketchTest.java |  18 ++-
 .../com/yahoo/sketches/hll/PreambleUtilTest.java   |  18 ++-
 .../java/com/yahoo/sketches/hll/TablesTest.java    |  18 ++-
 .../yahoo/sketches/hll/ToFromByteArrayTest.java    |  18 ++-
 .../java/com/yahoo/sketches/hll/UnionCaseTest.java |  18 ++-
 .../java/com/yahoo/sketches/hll/UnionTest.java     |  18 ++-
 .../yahoo/sketches/hllmap/CouponHashMapTest.java   |  18 ++-
 .../sketches/hllmap/CouponTraverseMapTest.java     |  18 ++-
 .../java/com/yahoo/sketches/hllmap/HllMapTest.java |  18 ++-
 .../yahoo/sketches/hllmap/SingleCouponMapTest.java |  18 ++-
 .../yahoo/sketches/hllmap/UniqueCountMapTest.java  |  18 ++-
 .../yahoo/sketches/kll/DeprecatedAndMiscTest.java  |  18 ++-
 .../sketches/kll/KllFloatsSketchIteratorTest.java  |  18 ++-
 .../yahoo/sketches/kll/KllFloatsSketchTest.java    |  19 +++
 .../com/yahoo/sketches/kll/KllValidationTest.java  |  19 +++
 .../com/yahoo/sketches/quantiles/AccuracyTest.java |  18 ++-
 .../yahoo/sketches/quantiles/DebugUnionTest.java   |  18 ++-
 .../sketches/quantiles/DeprecatedAndMiscTest.java  |  18 ++-
 .../quantiles/DirectCompactDoublesSketchTest.java  |  18 ++-
 .../DirectQuantilesMemoryRequestTest.java          |  18 ++-
 .../quantiles/DirectUpdateDoublesSketchTest.java   |  18 ++-
 .../quantiles/DoublesSketchBuilderTest.java        |  18 ++-
 .../quantiles/DoublesSketchIteratorTest.java       |  18 ++-
 .../sketches/quantiles/DoublesSketchTest.java      |  19 +++
 .../quantiles/DoublesUnionBuilderTest.java         |  18 ++-
 .../sketches/quantiles/DoublesUnionImplTest.java   |  18 ++-
 .../yahoo/sketches/quantiles/DoublesUtilTest.java  |  18 ++-
 .../quantiles/ForwardCompatibilityTest.java        |  18 ++-
 .../quantiles/HeapCompactDoublesSketchTest.java    |  18 ++-
 .../quantiles/HeapUpdateDoublesSketchTest.java     |  18 ++-
 .../quantiles/ItemsSketchIteratorTest.java         |  18 ++-
 .../yahoo/sketches/quantiles/ItemsSketchTest.java  |  18 ++-
 .../yahoo/sketches/quantiles/ItemsUnionTest.java   |  18 ++-
 .../yahoo/sketches/quantiles/PreambleUtilTest.java |  18 ++-
 .../sketches/quantiles/ReadOnlyMemoryTest.java     |  18 ++-
 .../sketches/quantiles/SerDeCompatibilityTest.java |  18 ++-
 .../com/yahoo/sketches/quantiles/UtilTest.java     |  18 ++-
 .../sampling/ReservoirItemsSketchTest.java         |  18 ++-
 .../sketches/sampling/ReservoirItemsUnionTest.java |  18 ++-
 .../sampling/ReservoirLongsSketchTest.java         |  18 ++-
 .../sketches/sampling/ReservoirLongsUnionTest.java |  18 ++-
 .../yahoo/sketches/sampling/ReservoirSizeTest.java |  18 ++-
 .../sketches/sampling/VarOptItemsSamplesTest.java  |  18 ++-
 .../sketches/sampling/VarOptItemsSketchTest.java   |  18 ++-
 .../sketches/sampling/VarOptItemsUnionTest.java    |  18 ++-
 .../sketches/sampling/VersionConverterTest.java    |  18 ++-
 .../yahoo/sketches/theta/CompactSketchTest.java    |  19 ++-
 .../ConcurrentDirectQuickSelectSketchTest.java     |  19 ++-
 .../theta/ConcurrentHeapQuickSelectSketchTest.java |  19 ++-
 .../sketches/theta/DirectIntersectionTest.java     |  19 ++-
 .../theta/DirectQuickSelectSketchTest.java         |  19 ++-
 .../com/yahoo/sketches/theta/DirectUnionTest.java  |  19 ++-
 .../java/com/yahoo/sketches/theta/EmptyTest.java   |  19 +++
 .../com/yahoo/sketches/theta/ExamplesTest.java     |  19 ++-
 .../sketches/theta/ForwardCompatibilityTest.java   |  19 ++-
 .../yahoo/sketches/theta/HeapAlphaSketchTest.java  |  19 ++-
 .../com/yahoo/sketches/theta/HeapAnotBTest.java    |  19 ++-
 .../yahoo/sketches/theta/HeapIntersectionTest.java |  19 ++-
 .../sketches/theta/HeapQuickSelectSketchTest.java  |  19 ++-
 .../com/yahoo/sketches/theta/HeapUnionTest.java    |  19 ++-
 .../com/yahoo/sketches/theta/IteratorTest.java     |  18 ++-
 .../sketches/theta/JaccardSimilarityTest.java      |  18 ++-
 .../sketches/theta/PairwiseCornerCasesTest.java    |  18 ++-
 .../sketches/theta/PairwiseSetOperationsTest.java  |  18 ++-
 .../com/yahoo/sketches/theta/PreambleUtilTest.java |  19 ++-
 .../yahoo/sketches/theta/ReadOnlyMemoryTest.java   |  18 ++-
 .../com/yahoo/sketches/theta/SetOperationTest.java |  19 ++-
 .../yahoo/sketches/theta/SingleItemSketchTest.java |  18 ++-
 .../java/com/yahoo/sketches/theta/SketchTest.java  |  19 ++-
 .../com/yahoo/sketches/theta/SketchesTest.java     |  19 ++-
 .../com/yahoo/sketches/theta/UnionImplTest.java    |  19 ++-
 .../com/yahoo/sketches/theta/UpdateSketchTest.java |  19 ++-
 .../sketches/tuple/ArrayOfDoublesAnotBTest.java    |  19 ++-
 .../tuple/ArrayOfDoublesCompactSketchTest.java     |  19 ++-
 .../tuple/ArrayOfDoublesIntersectionTest.java      |  19 ++-
 .../tuple/ArrayOfDoublesQuickSelectSketchTest.java |  18 ++-
 .../sketches/tuple/ArrayOfDoublesUnionTest.java    |  18 ++-
 .../tuple/CompactSketchWithDoubleSummaryTest.java  |  19 ++-
 .../DirectArrayOfDoublesCompactSketchTest.java     |  19 ++-
 .../DirectArrayOfDoublesQuickSelectSketchTest.java |  18 ++-
 .../java/com/yahoo/sketches/tuple/FilterTest.java  |  21 ++-
 .../tuple/HeapArrayOfDoublesCompactSketchTest.java |  19 ++-
 .../HeapArrayOfDoublesQuickSelectSketchTest.java   |  19 ++-
 .../yahoo/sketches/tuple/ReadOnlyMemoryTest.java   |  19 +++
 .../sketches/tuple/SerializerDeserializerTest.java |  18 ++-
 .../java/com/yahoo/sketches/tuple/TestUtil.java    |  19 ++-
 .../UpdatableSketchWithDoubleSummaryTest.java      |  19 ++-
 .../tuple/strings/ArrayOfStringsSketchTest.java    |  18 ++-
 .../tuple/strings/ArrayOfStringsSummaryTest.java   |  18 ++-
 399 files changed, 6527 insertions(+), 847 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5fac442..032e5d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,23 @@
+# 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.
+
 # http://docs.travis-ci.com/user/customizing-the-build/
 
+# Execute Maven to create Cobertura report and submit Coveralls data:
+#. mvn cobertura:cobertura coveralls:report
+
 language: java
 
 sudo: false # faster builds
@@ -10,11 +28,14 @@ jdk:
 install:
  - mvn install -Dmaven.javadoc.skip=true -Dsource.skip=true -DskipTests=true -Dgpg.skip=true
 
+before_script:
+ - _JAVA_OPTIONS="-Xmx4g -Xms1g"
+
 script:
  - mvn clean compile test -Dgpg.skip=true
 
 after_success: 
-- bash <(curl -s https://codecov.io/bash)
+ - mvn clean cobertura:cobertura coveralls:report
 
 notifications:
   email: false
diff --git a/pom.xml b/pom.xml
index 506c894..ef286bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
     <packaging>jar</packaging> <!-- jar is the default -->
     <version>0.13.5-incubating-SNAPSHOT</version>
 
+    <!-- Project Information -->
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Core sketch algorithms used alone and by other repositories in the DataSketches library.</description>
     <url>https://datasketches.github.io/</url>
@@ -40,19 +41,20 @@
 
     <developers>
         <developer>
-            <name>DataSketchesDevelopers</name>
-            <organization>DataSketches</organization>
-            <organizationUrl>https://github.com/orgs/DataSketches/people</organizationUrl>
-        </developer>
-        <developer>
-            <name>DataSketchesCollaborators</name>
-            <organization>DataSketches</organization>
-            <organizationUrl>https://github.com/orgs/DataSketches/outside-collaborators</organizationUrl>
+            <name>Apache DataSketches Committers</name>
+            <url>https://datasketches.apache.org/community/#committers</url>
         </developer>
     </developers>
 
     <mailingLists>
         <mailingList>
+            <name>Apache DataSketches (incubating) developers list</name>
+            <subscribe>dev-subscribe@datasketches.apache.org</subscribe>
+            <unsubscribe>dev-unsubscribe@datasketches.apache.org</unsubscribe>
+            <post>dev@datasketches.apache.org</post>
+            <archive>https://mail-archives.apache.org/mod_mbox/datasketches-dev</archive>
+        </mailingList>
+        <mailingList>
             <name>sketches-user</name>
             <archive>https://groups.google.com/forum/#!forum/sketches-user</archive>
             <subscribe>mailto:sketches-user%2Bsubscribe@googlegroups.com</subscribe>
@@ -60,10 +62,11 @@
             <post>mailto:sketches-user@googlegroups.com</post>
         </mailingList>
     </mailingLists>
+    <!-- End Project Information -->
 
     <properties>
         <!-- System-wide properties -->
-        <argLine>-Xmx1024m -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8</argLine>
+        <argLine>-Xmx4g -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8</argLine>
         <charset.encoding>UTF-8</charset.encoding>
         <project.build.sourceEncoding>${charset.encoding}</project.build.sourceEncoding>
         <project.build.resourceEncoding>${charset.encoding}</project.build.resourceEncoding>
@@ -71,7 +74,7 @@
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        
+
         <!-- Dependencies -->
         <memory.version>0.12.2</memory.version>
         <testng.version>6.14.3</testng.version>
@@ -86,51 +89,57 @@
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
         <maven-help-plugin.version>3.1.0</maven-help-plugin.version>
         <maven-install-plugin.version>2.5.2</maven-install-plugin.version>
-        <maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
         <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
+        <maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
         <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
         <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
-        <maven-shade-plugin.version>3.2.1</maven-shade-plugin.version>
         <maven-site-plugin.version>3.5.1</maven-site-plugin.version>
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
         <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
         
         <!-- Codehaus.org Maven Plugins -->
+        <cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <license-maven-plugin.version>1.19</license-maven-plugin.version>
         <plexus-compiler-javac-errorprone.version>2.8.5</plexus-compiler-javac-errorprone.version>
         
-        <!-- Jacoco.org Maven Plugins -->
-        <jacoco-maven-plugin.version>0.8.3</jacoco-maven-plugin.version>
-        
         <!-- Sonatype.org Maven Plugins -->
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
         
-        <!-- Other Plugins -->
-
+        <!-- eluder.org Maven Plugins -->
+        <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
     </properties>
 
-    <prerequisites>
-        <maven>3.0.4</maven>
-    </prerequisites>
-
-    <scm>
-        <connection>scm:git:ssh://git@github.com/DataSketches/sketches-core.git</connection>
-        <developerConnection>scm:git:ssh://git@github.com/DataSketches/sketches-core.git</developerConnection>
-        <url>https://github.com/DataSketches/sketches-core</url>
-        <tag>HEAD</tag>
-    </scm>
-
+    <!-- Environment Settings -->
     <issueManagement>
         <system>GitHub Issues</system>
-        <url>https://github.com/DataSketches/sketches-core/issues</url>
+        <url>https://github.com/Apache/incubator-datasketches-java/issues</url>
     </issueManagement>
 
     <ciManagement>
         <system>travis</system>
-        <url>https://travis-ci.org/DataSketches/sketches-core</url>
+        <url>https://travis-ci.org/apache/incubator-datasketches-java</url>
     </ciManagement>
 
+    <scm>
+        <connection>scm:git:ssh://git@github.com/apache/incubator-datasketches-java.git</connection>
+        <developerConnection>scm:git:ssh://git@github.com/apache/incubator-datasketches-java.git</developerConnection>
+        <url>https://github.com/apache/incubator-datasketches-java.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <prerequisites>
+        <maven>3.0.4</maven>
+    </prerequisites>
+
+    <repositories>
+        <repository>
+            <id>jcenter</id>
+            <name>bintray</name>
+            <url>https://jcenter.bintray.com</url>
+        </repository>
+    </repositories>
+
     <distributionManagement>
         <repository>
             <id>sonatype-nexus-staging</id>
@@ -144,7 +153,7 @@
             <artifactId>memory</artifactId>
             <version>${memory.version}</version>
         </dependency>
-            
+
         <!-- Test Scope -->
         <dependency>
             <groupId>org.testng</groupId>
@@ -152,8 +161,8 @@
             <version>${testng.version}</version>
             <scope>test</scope>
         </dependency>
-            
-        <!-- logging -->
+
+        <!-- Logging -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -162,14 +171,6 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>jcenter</id>
-            <name>bintray</name>
-            <url>https://jcenter.bintray.com</url>
-        </repository>
-    </repositories>
-
     <build>
         <plugins>
 
@@ -218,25 +219,19 @@
                 </configuration>
             </plugin>
 
-            <!-- Code coverage plugin, generates coverage report to target/site/jacoco/
-                 To skip coverage generation add -Djacoco.skip=true -->
+            <!-- Generates code coverage report from website. -->
             <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+            </plugin>
+
+             <!-- Submit code coverage report to Coveralls.io. -->
+            <plugin>
+                <groupId>org.eluder.coveralls</groupId>
+                <artifactId>coveralls-maven-plugin</artifactId>
+                <configuration>
+                    <!-- Since we use Travis CI we do not have to put a Coveralls token here. -->
+                </configuration>
             </plugin>
 
             <plugin>
@@ -257,18 +252,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
 
         <pluginManagement>
@@ -348,12 +331,6 @@
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-shade-plugin</artifactId>
-                    <version>${maven-shade-plugin.version}</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
                     <version>${maven-site-plugin.version}</version>
                 </plugin>
@@ -384,9 +361,20 @@
                 </plugin>
 
                 <plugin>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>${jacoco-maven-plugin.version}</version>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>cobertura-maven-plugin</artifactId>
+                    <version>${cobertura-maven-plugin.version}</version>
+                    <configuration>
+                        <format>xml</format>
+                        <!-- aggregated reports for multi-module projects, for when we use modules -->
+                        <aggregate>true</aggregate>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.eluder.coveralls</groupId>
+                    <artifactId>coveralls-maven-plugin</artifactId>
+                    <version>${coveralls-maven-plugin.version}</version>
                 </plugin>
 
                 <plugin>
@@ -401,6 +389,7 @@
 
     <reporting />
 
+    <!-- This is optional -->
     <profiles>
         <profile>
             <id>strict</id>
diff --git a/src/main/java/com/yahoo/sketches/ArrayOfBooleansSerDe.java b/src/main/java/com/yahoo/sketches/ArrayOfBooleansSerDe.java
index dc92aaf..78cfdca 100644
--- a/src/main/java/com/yahoo/sketches/ArrayOfBooleansSerDe.java
+++ b/src/main/java/com/yahoo/sketches/ArrayOfBooleansSerDe.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/ArrayOfDoublesSerDe.java b/src/main/java/com/yahoo/sketches/ArrayOfDoublesSerDe.java
index decadc7..690a4db 100644
--- a/src/main/java/com/yahoo/sketches/ArrayOfDoublesSerDe.java
+++ b/src/main/java/com/yahoo/sketches/ArrayOfDoublesSerDe.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/ArrayOfItemsSerDe.java b/src/main/java/com/yahoo/sketches/ArrayOfItemsSerDe.java
index 073f2f4..2ccf837 100644
--- a/src/main/java/com/yahoo/sketches/ArrayOfItemsSerDe.java
+++ b/src/main/java/com/yahoo/sketches/ArrayOfItemsSerDe.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/ArrayOfLongsSerDe.java b/src/main/java/com/yahoo/sketches/ArrayOfLongsSerDe.java
index ef15759..46ee341 100644
--- a/src/main/java/com/yahoo/sketches/ArrayOfLongsSerDe.java
+++ b/src/main/java/com/yahoo/sketches/ArrayOfLongsSerDe.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/ArrayOfNumbersSerDe.java b/src/main/java/com/yahoo/sketches/ArrayOfNumbersSerDe.java
index 8b0a89f..d205270 100644
--- a/src/main/java/com/yahoo/sketches/ArrayOfNumbersSerDe.java
+++ b/src/main/java/com/yahoo/sketches/ArrayOfNumbersSerDe.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/ArrayOfStringsSerDe.java b/src/main/java/com/yahoo/sketches/ArrayOfStringsSerDe.java
index 13702fc..f866855 100644
--- a/src/main/java/com/yahoo/sketches/ArrayOfStringsSerDe.java
+++ b/src/main/java/com/yahoo/sketches/ArrayOfStringsSerDe.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/ArrayOfUtf16StringsSerDe.java b/src/main/java/com/yahoo/sketches/ArrayOfUtf16StringsSerDe.java
index 79555a5..12ed603 100644
--- a/src/main/java/com/yahoo/sketches/ArrayOfUtf16StringsSerDe.java
+++ b/src/main/java/com/yahoo/sketches/ArrayOfUtf16StringsSerDe.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/BinomialBoundsN.java b/src/main/java/com/yahoo/sketches/BinomialBoundsN.java
index ffc64fe..c948bb9 100644
--- a/src/main/java/com/yahoo/sketches/BinomialBoundsN.java
+++ b/src/main/java/com/yahoo/sketches/BinomialBoundsN.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/BoundsOnBinomialProportions.java b/src/main/java/com/yahoo/sketches/BoundsOnBinomialProportions.java
index cb0ebf7..55e6ee6 100644
--- a/src/main/java/com/yahoo/sketches/BoundsOnBinomialProportions.java
+++ b/src/main/java/com/yahoo/sketches/BoundsOnBinomialProportions.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/BoundsOnRatiosInSampledSets.java b/src/main/java/com/yahoo/sketches/BoundsOnRatiosInSampledSets.java
index 18d1200..9813403 100644
--- a/src/main/java/com/yahoo/sketches/BoundsOnRatiosInSampledSets.java
+++ b/src/main/java/com/yahoo/sketches/BoundsOnRatiosInSampledSets.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/BoundsOnRatiosInThetaSketchedSets.java b/src/main/java/com/yahoo/sketches/BoundsOnRatiosInThetaSketchedSets.java
index 41f7748..a03f2c4 100644
--- a/src/main/java/com/yahoo/sketches/BoundsOnRatiosInThetaSketchedSets.java
+++ b/src/main/java/com/yahoo/sketches/BoundsOnRatiosInThetaSketchedSets.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/ByteArrayUtil.java b/src/main/java/com/yahoo/sketches/ByteArrayUtil.java
index 0427549..5c973b4 100644
--- a/src/main/java/com/yahoo/sketches/ByteArrayUtil.java
+++ b/src/main/java/com/yahoo/sketches/ByteArrayUtil.java
@@ -1,3 +1,22 @@
+/*
+ * 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 com.yahoo.sketches;
 
 public final class ByteArrayUtil {
diff --git a/src/main/java/com/yahoo/sketches/EquivTables.java b/src/main/java/com/yahoo/sketches/EquivTables.java
index 52eeb24..4ae21b6 100644
--- a/src/main/java/com/yahoo/sketches/EquivTables.java
+++ b/src/main/java/com/yahoo/sketches/EquivTables.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/Family.java b/src/main/java/com/yahoo/sketches/Family.java
index 86eac6e..614c7d1 100644
--- a/src/main/java/com/yahoo/sketches/Family.java
+++ b/src/main/java/com/yahoo/sketches/Family.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/HashOperations.java b/src/main/java/com/yahoo/sketches/HashOperations.java
index 7da9f8f..f516620 100644
--- a/src/main/java/com/yahoo/sketches/HashOperations.java
+++ b/src/main/java/com/yahoo/sketches/HashOperations.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/QuantilesHelper.java b/src/main/java/com/yahoo/sketches/QuantilesHelper.java
index 9dfc6e4..229f42e 100644
--- a/src/main/java/com/yahoo/sketches/QuantilesHelper.java
+++ b/src/main/java/com/yahoo/sketches/QuantilesHelper.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/QuickSelect.java b/src/main/java/com/yahoo/sketches/QuickSelect.java
index 25d1b78..a17e065 100644
--- a/src/main/java/com/yahoo/sketches/QuickSelect.java
+++ b/src/main/java/com/yahoo/sketches/QuickSelect.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/ResizeFactor.java b/src/main/java/com/yahoo/sketches/ResizeFactor.java
index e23ff95..68b9d18 100644
--- a/src/main/java/com/yahoo/sketches/ResizeFactor.java
+++ b/src/main/java/com/yahoo/sketches/ResizeFactor.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/SketchesArgumentException.java b/src/main/java/com/yahoo/sketches/SketchesArgumentException.java
index 5e7d9bc..48b40cb 100644
--- a/src/main/java/com/yahoo/sketches/SketchesArgumentException.java
+++ b/src/main/java/com/yahoo/sketches/SketchesArgumentException.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/SketchesException.java b/src/main/java/com/yahoo/sketches/SketchesException.java
index 7f02c72..a078955 100644
--- a/src/main/java/com/yahoo/sketches/SketchesException.java
+++ b/src/main/java/com/yahoo/sketches/SketchesException.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/SketchesReadOnlyException.java b/src/main/java/com/yahoo/sketches/SketchesReadOnlyException.java
index 706e1c1..3e8f4a7 100644
--- a/src/main/java/com/yahoo/sketches/SketchesReadOnlyException.java
+++ b/src/main/java/com/yahoo/sketches/SketchesReadOnlyException.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/SketchesStateException.java b/src/main/java/com/yahoo/sketches/SketchesStateException.java
index 96d4107..2234e97 100644
--- a/src/main/java/com/yahoo/sketches/SketchesStateException.java
+++ b/src/main/java/com/yahoo/sketches/SketchesStateException.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/Util.java b/src/main/java/com/yahoo/sketches/Util.java
index 2382d59..bb05514 100644
--- a/src/main/java/com/yahoo/sketches/Util.java
+++ b/src/main/java/com/yahoo/sketches/Util.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/main/java/com/yahoo/sketches/cpc/CompressedState.java b/src/main/java/com/yahoo/sketches/cpc/CompressedState.java
index 28c771b..0f7c3aa 100644
--- a/src/main/java/com/yahoo/sketches/cpc/CompressedState.java
+++ b/src/main/java/com/yahoo/sketches/cpc/CompressedState.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/main/java/com/yahoo/sketches/cpc/CompressionData.java b/src/main/java/com/yahoo/sketches/cpc/CompressionData.java
index 90ead05..6531ae4 100644
--- a/src/main/java/com/yahoo/sketches/cpc/CompressionData.java
+++ b/src/main/java/com/yahoo/sketches/cpc/CompressionData.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/main/java/com/yahoo/sketches/cpc/CpcCompression.java b/src/main/java/com/yahoo/sketches/cpc/CpcCompression.java
index 9092c7e..9c81ee3 100644
--- a/src/main/java/com/yahoo/sketches/cpc/CpcCompression.java
+++ b/src/main/java/com/yahoo/sketches/cpc/CpcCompression.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/main/java/com/yahoo/sketches/cpc/CpcConfidence.java b/src/main/java/com/yahoo/sketches/cpc/CpcConfidence.java
index 0bbbf00..7d935b6 100644
--- a/src/main/java/com/yahoo/sketches/cpc/CpcConfidence.java
+++ b/src/main/java/com/yahoo/sketches/cpc/CpcConfidence.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/main/java/com/yahoo/sketches/cpc/CpcSketch.java b/src/main/java/com/yahoo/sketches/cpc/CpcSketch.java
index 1340165..f05b8c7 100644
--- a/src/main/java/com/yahoo/sketches/cpc/CpcSketch.java
+++ b/src/main/java/com/yahoo/sketches/cpc/CpcSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/main/java/com/yahoo/sketches/cpc/CpcUnion.java b/src/main/java/com/yahoo/sketches/cpc/CpcUnion.java
index cdbcdb8..dbb0efa 100644
--- a/src/main/java/com/yahoo/sketches/cpc/CpcUnion.java
+++ b/src/main/java/com/yahoo/sketches/cpc/CpcUnion.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/main/java/com/yahoo/sketches/cpc/CpcUtil.java b/src/main/java/com/yahoo/sketches/cpc/CpcUtil.java
index 3a94a70..f849adf 100644
--- a/src/main/java/com/yahoo/sketches/cpc/CpcUtil.java
+++ b/src/main/java/com/yahoo/sketches/cpc/CpcUtil.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/main/java/com/yahoo/sketches/cpc/CpcWrapper.java b/src/main/java/com/yahoo/sketches/cpc/CpcWrapper.java
index 1ba1e67..ae3722b 100644
--- a/src/main/java/com/yahoo/sketches/cpc/CpcWrapper.java
+++ b/src/main/java/com/yahoo/sketches/cpc/CpcWrapper.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/main/java/com/yahoo/sketches/cpc/Flavor.java b/src/main/java/com/yahoo/sketches/cpc/Flavor.java
index caae224..f540eff 100644
--- a/src/main/java/com/yahoo/sketches/cpc/Flavor.java
+++ b/src/main/java/com/yahoo/sketches/cpc/Flavor.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/main/java/com/yahoo/sketches/cpc/Format.java b/src/main/java/com/yahoo/sketches/cpc/Format.java
index 06ca3ee..5dcdd98 100644
--- a/src/main/java/com/yahoo/sketches/cpc/Format.java
+++ b/src/main/java/com/yahoo/sketches/cpc/Format.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/main/java/com/yahoo/sketches/cpc/IconEstimator.java b/src/main/java/com/yahoo/sketches/cpc/IconEstimator.java
index d0ba3a7..9c30151 100644
--- a/src/main/java/com/yahoo/sketches/cpc/IconEstimator.java
+++ b/src/main/java/com/yahoo/sketches/cpc/IconEstimator.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/main/java/com/yahoo/sketches/cpc/IconPolynomialCoefficients.java b/src/main/java/com/yahoo/sketches/cpc/IconPolynomialCoefficients.java
index 778b19c..8f7fd42 100644
--- a/src/main/java/com/yahoo/sketches/cpc/IconPolynomialCoefficients.java
+++ b/src/main/java/com/yahoo/sketches/cpc/IconPolynomialCoefficients.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/main/java/com/yahoo/sketches/cpc/PairTable.java b/src/main/java/com/yahoo/sketches/cpc/PairTable.java
index 8ed6c06..014587a 100644
--- a/src/main/java/com/yahoo/sketches/cpc/PairTable.java
+++ b/src/main/java/com/yahoo/sketches/cpc/PairTable.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/main/java/com/yahoo/sketches/cpc/PreambleUtil.java b/src/main/java/com/yahoo/sketches/cpc/PreambleUtil.java
index bc807f1..4cf5293 100644
--- a/src/main/java/com/yahoo/sketches/cpc/PreambleUtil.java
+++ b/src/main/java/com/yahoo/sketches/cpc/PreambleUtil.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/main/java/com/yahoo/sketches/cpc/RuntimeAsserts.java b/src/main/java/com/yahoo/sketches/cpc/RuntimeAsserts.java
index 2cfadd4..12b96ed 100644
--- a/src/main/java/com/yahoo/sketches/cpc/RuntimeAsserts.java
+++ b/src/main/java/com/yahoo/sketches/cpc/RuntimeAsserts.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/main/java/com/yahoo/sketches/cpc/package-info.java b/src/main/java/com/yahoo/sketches/cpc/package-info.java
index 39df347..13f336e 100644
--- a/src/main/java/com/yahoo/sketches/cpc/package-info.java
+++ b/src/main/java/com/yahoo/sketches/cpc/package-info.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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.
  */
 
 /**
diff --git a/src/main/java/com/yahoo/sketches/fdt/FdtSketch.java b/src/main/java/com/yahoo/sketches/fdt/FdtSketch.java
index 69a8f5f..e73cb8c 100644
--- a/src/main/java/com/yahoo/sketches/fdt/FdtSketch.java
+++ b/src/main/java/com/yahoo/sketches/fdt/FdtSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.fdt;
diff --git a/src/main/java/com/yahoo/sketches/fdt/Group.java b/src/main/java/com/yahoo/sketches/fdt/Group.java
index 35d2882..5561131 100644
--- a/src/main/java/com/yahoo/sketches/fdt/Group.java
+++ b/src/main/java/com/yahoo/sketches/fdt/Group.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.fdt;
diff --git a/src/main/java/com/yahoo/sketches/fdt/PostProcessor.java b/src/main/java/com/yahoo/sketches/fdt/PostProcessor.java
index 8134924..c113cd0 100644
--- a/src/main/java/com/yahoo/sketches/fdt/PostProcessor.java
+++ b/src/main/java/com/yahoo/sketches/fdt/PostProcessor.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.fdt;
diff --git a/src/main/java/com/yahoo/sketches/fdt/package-info.java b/src/main/java/com/yahoo/sketches/fdt/package-info.java
index de11cff..542d72c 100644
--- a/src/main/java/com/yahoo/sketches/fdt/package-info.java
+++ b/src/main/java/com/yahoo/sketches/fdt/package-info.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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.
  */
 
 /**
diff --git a/src/main/java/com/yahoo/sketches/frequencies/ErrorType.java b/src/main/java/com/yahoo/sketches/frequencies/ErrorType.java
index 2e1902d..8a4a9e9 100644
--- a/src/main/java/com/yahoo/sketches/frequencies/ErrorType.java
+++ b/src/main/java/com/yahoo/sketches/frequencies/ErrorType.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.frequencies;
diff --git a/src/main/java/com/yahoo/sketches/frequencies/ItemsSketch.java b/src/main/java/com/yahoo/sketches/frequencies/ItemsSketch.java
index 0f3da2c..5760b29 100644
--- a/src/main/java/com/yahoo/sketches/frequencies/ItemsSketch.java
+++ b/src/main/java/com/yahoo/sketches/frequencies/ItemsSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the Apache License 2.0. See LICENSE file
- * at the project root for terms.
+ * 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 com.yahoo.sketches.frequencies;
diff --git a/src/main/java/com/yahoo/sketches/frequencies/LongsSketch.java b/src/main/java/com/yahoo/sketches/frequencies/LongsSketch.java
index faf2033..0e46e5a 100644
--- a/src/main/java/com/yahoo/sketches/frequencies/LongsSketch.java
+++ b/src/main/java/com/yahoo/sketches/frequencies/LongsSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the Apache License 2.0. See LICENSE file
- * at the project root for terms.
+ * 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 com.yahoo.sketches.frequencies;
diff --git a/src/main/java/com/yahoo/sketches/frequencies/PreambleUtil.java b/src/main/java/com/yahoo/sketches/frequencies/PreambleUtil.java
index e390f62..6373dc7 100644
--- a/src/main/java/com/yahoo/sketches/frequencies/PreambleUtil.java
+++ b/src/main/java/com/yahoo/sketches/frequencies/PreambleUtil.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the Apache License 2.0. See LICENSE file
- * at the project root for terms.
+ * 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 com.yahoo.sketches.frequencies;
diff --git a/src/main/java/com/yahoo/sketches/frequencies/ReversePurgeItemHashMap.java b/src/main/java/com/yahoo/sketches/frequencies/ReversePurgeItemHashMap.java
index 196c268..0fbc65a 100644
--- a/src/main/java/com/yahoo/sketches/frequencies/ReversePurgeItemHashMap.java
+++ b/src/main/java/com/yahoo/sketches/frequencies/ReversePurgeItemHashMap.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the Apache License 2.0. See LICENSE file
- * at the project root for terms.
+ * 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 com.yahoo.sketches.frequencies;
diff --git a/src/main/java/com/yahoo/sketches/frequencies/ReversePurgeLongHashMap.java b/src/main/java/com/yahoo/sketches/frequencies/ReversePurgeLongHashMap.java
index a6e783a..e4462b4 100644
--- a/src/main/java/com/yahoo/sketches/frequencies/ReversePurgeLongHashMap.java
+++ b/src/main/java/com/yahoo/sketches/frequencies/ReversePurgeLongHashMap.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the Apache License 2.0. See LICENSE file
- * at the project root for terms.
+ * 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 com.yahoo.sketches.frequencies;
diff --git a/src/main/java/com/yahoo/sketches/frequencies/Util.java b/src/main/java/com/yahoo/sketches/frequencies/Util.java
index 615eb92..9c50189 100644
--- a/src/main/java/com/yahoo/sketches/frequencies/Util.java
+++ b/src/main/java/com/yahoo/sketches/frequencies/Util.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.frequencies;
diff --git a/src/main/java/com/yahoo/sketches/frequencies/package-info.java b/src/main/java/com/yahoo/sketches/frequencies/package-info.java
index 53681bd..5c1a83b 100644
--- a/src/main/java/com/yahoo/sketches/frequencies/package-info.java
+++ b/src/main/java/com/yahoo/sketches/frequencies/package-info.java
@@ -1,7 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root 
- * for terms.
+ * 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.
  */
 
 /**
diff --git a/src/main/java/com/yahoo/sketches/hash/MurmurHash3.java b/src/main/java/com/yahoo/sketches/hash/MurmurHash3.java
index 64ce99f..e42239d 100644
--- a/src/main/java/com/yahoo/sketches/hash/MurmurHash3.java
+++ b/src/main/java/com/yahoo/sketches/hash/MurmurHash3.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hash;
diff --git a/src/main/java/com/yahoo/sketches/hash/MurmurHash3Adaptor.java b/src/main/java/com/yahoo/sketches/hash/MurmurHash3Adaptor.java
index a428844..5b91cb3 100644
--- a/src/main/java/com/yahoo/sketches/hash/MurmurHash3Adaptor.java
+++ b/src/main/java/com/yahoo/sketches/hash/MurmurHash3Adaptor.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hash;
diff --git a/src/main/java/com/yahoo/sketches/hash/MurmurHash3v2.java b/src/main/java/com/yahoo/sketches/hash/MurmurHash3v2.java
index d8f5971..0373bf1 100644
--- a/src/main/java/com/yahoo/sketches/hash/MurmurHash3v2.java
+++ b/src/main/java/com/yahoo/sketches/hash/MurmurHash3v2.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hash;
diff --git a/src/main/java/com/yahoo/sketches/hash/XxHash.java b/src/main/java/com/yahoo/sketches/hash/XxHash.java
index 88824ea..13ff437 100644
--- a/src/main/java/com/yahoo/sketches/hash/XxHash.java
+++ b/src/main/java/com/yahoo/sketches/hash/XxHash.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hash;
diff --git a/src/main/java/com/yahoo/sketches/hash/package-info.java b/src/main/java/com/yahoo/sketches/hash/package-info.java
index 27cc448..5bd0121 100644
--- a/src/main/java/com/yahoo/sketches/hash/package-info.java
+++ b/src/main/java/com/yahoo/sketches/hash/package-info.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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.
  */
 
 /**
diff --git a/src/main/java/com/yahoo/sketches/hll/AbstractCoupons.java b/src/main/java/com/yahoo/sketches/hll/AbstractCoupons.java
index 86504bb..ff3f7a8 100644
--- a/src/main/java/com/yahoo/sketches/hll/AbstractCoupons.java
+++ b/src/main/java/com/yahoo/sketches/hll/AbstractCoupons.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/AbstractHllArray.java b/src/main/java/com/yahoo/sketches/hll/AbstractHllArray.java
index d246ad0..3666b67 100644
--- a/src/main/java/com/yahoo/sketches/hll/AbstractHllArray.java
+++ b/src/main/java/com/yahoo/sketches/hll/AbstractHllArray.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/AuxHashMap.java b/src/main/java/com/yahoo/sketches/hll/AuxHashMap.java
index 5844252..14b0089 100644
--- a/src/main/java/com/yahoo/sketches/hll/AuxHashMap.java
+++ b/src/main/java/com/yahoo/sketches/hll/AuxHashMap.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/BaseHllSketch.java b/src/main/java/com/yahoo/sketches/hll/BaseHllSketch.java
index 978c85c..5bd336d 100644
--- a/src/main/java/com/yahoo/sketches/hll/BaseHllSketch.java
+++ b/src/main/java/com/yahoo/sketches/hll/BaseHllSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/CompositeInterpolationXTable.java b/src/main/java/com/yahoo/sketches/hll/CompositeInterpolationXTable.java
index f9da6e4..9fd0598 100644
--- a/src/main/java/com/yahoo/sketches/hll/CompositeInterpolationXTable.java
+++ b/src/main/java/com/yahoo/sketches/hll/CompositeInterpolationXTable.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/Conversions.java b/src/main/java/com/yahoo/sketches/hll/Conversions.java
index 2ad9a76..5e62121 100644
--- a/src/main/java/com/yahoo/sketches/hll/Conversions.java
+++ b/src/main/java/com/yahoo/sketches/hll/Conversions.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/CouponHashSet.java b/src/main/java/com/yahoo/sketches/hll/CouponHashSet.java
index 6a5b30e..a7bda4e 100644
--- a/src/main/java/com/yahoo/sketches/hll/CouponHashSet.java
+++ b/src/main/java/com/yahoo/sketches/hll/CouponHashSet.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/CouponList.java b/src/main/java/com/yahoo/sketches/hll/CouponList.java
index 54a12f7..120ee72 100644
--- a/src/main/java/com/yahoo/sketches/hll/CouponList.java
+++ b/src/main/java/com/yahoo/sketches/hll/CouponList.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/CouponMapping.java b/src/main/java/com/yahoo/sketches/hll/CouponMapping.java
index 5c78aed..b8d3a34 100644
--- a/src/main/java/com/yahoo/sketches/hll/CouponMapping.java
+++ b/src/main/java/com/yahoo/sketches/hll/CouponMapping.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/CubicInterpolation.java b/src/main/java/com/yahoo/sketches/hll/CubicInterpolation.java
index 8469064..b83a712 100644
--- a/src/main/java/com/yahoo/sketches/hll/CubicInterpolation.java
+++ b/src/main/java/com/yahoo/sketches/hll/CubicInterpolation.java
@@ -1,3 +1,22 @@
+/*
+ * 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 com.yahoo.sketches.hll;
 
 import com.yahoo.sketches.SketchesArgumentException;
diff --git a/src/main/java/com/yahoo/sketches/hll/CurMode.java b/src/main/java/com/yahoo/sketches/hll/CurMode.java
index 34173f2..da9e9d9 100644
--- a/src/main/java/com/yahoo/sketches/hll/CurMode.java
+++ b/src/main/java/com/yahoo/sketches/hll/CurMode.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/DirectAuxHashMap.java b/src/main/java/com/yahoo/sketches/hll/DirectAuxHashMap.java
index bfa8510..5d31028 100644
--- a/src/main/java/com/yahoo/sketches/hll/DirectAuxHashMap.java
+++ b/src/main/java/com/yahoo/sketches/hll/DirectAuxHashMap.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/DirectCouponHashSet.java b/src/main/java/com/yahoo/sketches/hll/DirectCouponHashSet.java
index 124fd02..b3a81ca 100644
--- a/src/main/java/com/yahoo/sketches/hll/DirectCouponHashSet.java
+++ b/src/main/java/com/yahoo/sketches/hll/DirectCouponHashSet.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/DirectCouponList.java b/src/main/java/com/yahoo/sketches/hll/DirectCouponList.java
index e79061f..4b8ae70 100644
--- a/src/main/java/com/yahoo/sketches/hll/DirectCouponList.java
+++ b/src/main/java/com/yahoo/sketches/hll/DirectCouponList.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/DirectHll4Array.java b/src/main/java/com/yahoo/sketches/hll/DirectHll4Array.java
index 845924e..2d902a1 100644
--- a/src/main/java/com/yahoo/sketches/hll/DirectHll4Array.java
+++ b/src/main/java/com/yahoo/sketches/hll/DirectHll4Array.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/DirectHll6Array.java b/src/main/java/com/yahoo/sketches/hll/DirectHll6Array.java
index c63bfc9..c64e37f 100644
--- a/src/main/java/com/yahoo/sketches/hll/DirectHll6Array.java
+++ b/src/main/java/com/yahoo/sketches/hll/DirectHll6Array.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/DirectHll8Array.java b/src/main/java/com/yahoo/sketches/hll/DirectHll8Array.java
index 0504b26..63c9535 100644
--- a/src/main/java/com/yahoo/sketches/hll/DirectHll8Array.java
+++ b/src/main/java/com/yahoo/sketches/hll/DirectHll8Array.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/DirectHllArray.java b/src/main/java/com/yahoo/sketches/hll/DirectHllArray.java
index 38569c0..4c22b36 100644
--- a/src/main/java/com/yahoo/sketches/hll/DirectHllArray.java
+++ b/src/main/java/com/yahoo/sketches/hll/DirectHllArray.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/HarmonicNumbers.java b/src/main/java/com/yahoo/sketches/hll/HarmonicNumbers.java
index 5eb3ec2..93c625c 100644
--- a/src/main/java/com/yahoo/sketches/hll/HarmonicNumbers.java
+++ b/src/main/java/com/yahoo/sketches/hll/HarmonicNumbers.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/HeapAuxHashMap.java b/src/main/java/com/yahoo/sketches/hll/HeapAuxHashMap.java
index 3163fd5..f4fdd9f 100644
--- a/src/main/java/com/yahoo/sketches/hll/HeapAuxHashMap.java
+++ b/src/main/java/com/yahoo/sketches/hll/HeapAuxHashMap.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/Hll4Array.java b/src/main/java/com/yahoo/sketches/hll/Hll4Array.java
index eb72141..6ad4390 100644
--- a/src/main/java/com/yahoo/sketches/hll/Hll4Array.java
+++ b/src/main/java/com/yahoo/sketches/hll/Hll4Array.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/Hll4Update.java b/src/main/java/com/yahoo/sketches/hll/Hll4Update.java
index 229fa51..3d8c8eb 100644
--- a/src/main/java/com/yahoo/sketches/hll/Hll4Update.java
+++ b/src/main/java/com/yahoo/sketches/hll/Hll4Update.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/Hll6Array.java b/src/main/java/com/yahoo/sketches/hll/Hll6Array.java
index b7f26d4..bf1708c 100644
--- a/src/main/java/com/yahoo/sketches/hll/Hll6Array.java
+++ b/src/main/java/com/yahoo/sketches/hll/Hll6Array.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/Hll8Array.java b/src/main/java/com/yahoo/sketches/hll/Hll8Array.java
index 309a237..2777c0e 100644
--- a/src/main/java/com/yahoo/sketches/hll/Hll8Array.java
+++ b/src/main/java/com/yahoo/sketches/hll/Hll8Array.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/HllArray.java b/src/main/java/com/yahoo/sketches/hll/HllArray.java
index e12a03d..112a6cc 100644
--- a/src/main/java/com/yahoo/sketches/hll/HllArray.java
+++ b/src/main/java/com/yahoo/sketches/hll/HllArray.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/HllEstimators.java b/src/main/java/com/yahoo/sketches/hll/HllEstimators.java
index 4cbe090..ba14204 100644
--- a/src/main/java/com/yahoo/sketches/hll/HllEstimators.java
+++ b/src/main/java/com/yahoo/sketches/hll/HllEstimators.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/HllPairIterator.java b/src/main/java/com/yahoo/sketches/hll/HllPairIterator.java
index ae9677d..d59f9a2 100644
--- a/src/main/java/com/yahoo/sketches/hll/HllPairIterator.java
+++ b/src/main/java/com/yahoo/sketches/hll/HllPairIterator.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/HllSketch.java b/src/main/java/com/yahoo/sketches/hll/HllSketch.java
index b60f6b0..c052c7d 100644
--- a/src/main/java/com/yahoo/sketches/hll/HllSketch.java
+++ b/src/main/java/com/yahoo/sketches/hll/HllSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/HllSketchImpl.java b/src/main/java/com/yahoo/sketches/hll/HllSketchImpl.java
index 8597511..c1b9a5f 100644
--- a/src/main/java/com/yahoo/sketches/hll/HllSketchImpl.java
+++ b/src/main/java/com/yahoo/sketches/hll/HllSketchImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/HllUtil.java b/src/main/java/com/yahoo/sketches/hll/HllUtil.java
index ab0c487..f5d4b87 100644
--- a/src/main/java/com/yahoo/sketches/hll/HllUtil.java
+++ b/src/main/java/com/yahoo/sketches/hll/HllUtil.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/IntArrayPairIterator.java b/src/main/java/com/yahoo/sketches/hll/IntArrayPairIterator.java
index 4012683..a4bd14c 100644
--- a/src/main/java/com/yahoo/sketches/hll/IntArrayPairIterator.java
+++ b/src/main/java/com/yahoo/sketches/hll/IntArrayPairIterator.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/IntMemoryPairIterator.java b/src/main/java/com/yahoo/sketches/hll/IntMemoryPairIterator.java
index c0c9583..5dd73f1 100644
--- a/src/main/java/com/yahoo/sketches/hll/IntMemoryPairIterator.java
+++ b/src/main/java/com/yahoo/sketches/hll/IntMemoryPairIterator.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/PairIterator.java b/src/main/java/com/yahoo/sketches/hll/PairIterator.java
index 5fa064b..71b46d0 100644
--- a/src/main/java/com/yahoo/sketches/hll/PairIterator.java
+++ b/src/main/java/com/yahoo/sketches/hll/PairIterator.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/PreambleUtil.java b/src/main/java/com/yahoo/sketches/hll/PreambleUtil.java
index 25b131f..610949a 100644
--- a/src/main/java/com/yahoo/sketches/hll/PreambleUtil.java
+++ b/src/main/java/com/yahoo/sketches/hll/PreambleUtil.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/RelativeErrorTables.java b/src/main/java/com/yahoo/sketches/hll/RelativeErrorTables.java
index 52a2928..68ec120 100644
--- a/src/main/java/com/yahoo/sketches/hll/RelativeErrorTables.java
+++ b/src/main/java/com/yahoo/sketches/hll/RelativeErrorTables.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/TgtHllType.java b/src/main/java/com/yahoo/sketches/hll/TgtHllType.java
index 0cba242..515069c 100644
--- a/src/main/java/com/yahoo/sketches/hll/TgtHllType.java
+++ b/src/main/java/com/yahoo/sketches/hll/TgtHllType.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/ToByteArrayImpl.java b/src/main/java/com/yahoo/sketches/hll/ToByteArrayImpl.java
index fcc2fb2..644c696 100644
--- a/src/main/java/com/yahoo/sketches/hll/ToByteArrayImpl.java
+++ b/src/main/java/com/yahoo/sketches/hll/ToByteArrayImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/Union.java b/src/main/java/com/yahoo/sketches/hll/Union.java
index ada93c1..5a11136 100644
--- a/src/main/java/com/yahoo/sketches/hll/Union.java
+++ b/src/main/java/com/yahoo/sketches/hll/Union.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/main/java/com/yahoo/sketches/hll/package-info.java b/src/main/java/com/yahoo/sketches/hll/package-info.java
index 6898052..419f40a 100644
--- a/src/main/java/com/yahoo/sketches/hll/package-info.java
+++ b/src/main/java/com/yahoo/sketches/hll/package-info.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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.
  */
 
 /**
diff --git a/src/main/java/com/yahoo/sketches/hllmap/CouponHashMap.java b/src/main/java/com/yahoo/sketches/hllmap/CouponHashMap.java
index 223f482..2d4d00e 100644
--- a/src/main/java/com/yahoo/sketches/hllmap/CouponHashMap.java
+++ b/src/main/java/com/yahoo/sketches/hllmap/CouponHashMap.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hllmap;
diff --git a/src/main/java/com/yahoo/sketches/hllmap/CouponTraverseMap.java b/src/main/java/com/yahoo/sketches/hllmap/CouponTraverseMap.java
index 6f61d2e..fca9fce 100644
--- a/src/main/java/com/yahoo/sketches/hllmap/CouponTraverseMap.java
+++ b/src/main/java/com/yahoo/sketches/hllmap/CouponTraverseMap.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hllmap;
diff --git a/src/main/java/com/yahoo/sketches/hllmap/CouponsIterator.java b/src/main/java/com/yahoo/sketches/hllmap/CouponsIterator.java
index 68e57de..6d002b0 100644
--- a/src/main/java/com/yahoo/sketches/hllmap/CouponsIterator.java
+++ b/src/main/java/com/yahoo/sketches/hllmap/CouponsIterator.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hllmap;
diff --git a/src/main/java/com/yahoo/sketches/hllmap/HllMap.java b/src/main/java/com/yahoo/sketches/hllmap/HllMap.java
index 4a5b116..5e857af 100644
--- a/src/main/java/com/yahoo/sketches/hllmap/HllMap.java
+++ b/src/main/java/com/yahoo/sketches/hllmap/HllMap.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hllmap;
diff --git a/src/main/java/com/yahoo/sketches/hllmap/Map.java b/src/main/java/com/yahoo/sketches/hllmap/Map.java
index 61263c1..76016dc 100644
--- a/src/main/java/com/yahoo/sketches/hllmap/Map.java
+++ b/src/main/java/com/yahoo/sketches/hllmap/Map.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hllmap;
diff --git a/src/main/java/com/yahoo/sketches/hllmap/SingleCouponMap.java b/src/main/java/com/yahoo/sketches/hllmap/SingleCouponMap.java
index b539b8e..201e563 100644
--- a/src/main/java/com/yahoo/sketches/hllmap/SingleCouponMap.java
+++ b/src/main/java/com/yahoo/sketches/hllmap/SingleCouponMap.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hllmap;
diff --git a/src/main/java/com/yahoo/sketches/hllmap/UniqueCountMap.java b/src/main/java/com/yahoo/sketches/hllmap/UniqueCountMap.java
index 9bf431c..28dad76 100644
--- a/src/main/java/com/yahoo/sketches/hllmap/UniqueCountMap.java
+++ b/src/main/java/com/yahoo/sketches/hllmap/UniqueCountMap.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hllmap;
diff --git a/src/main/java/com/yahoo/sketches/hllmap/package-info.java b/src/main/java/com/yahoo/sketches/hllmap/package-info.java
index bda2845..d0b570f 100644
--- a/src/main/java/com/yahoo/sketches/hllmap/package-info.java
+++ b/src/main/java/com/yahoo/sketches/hllmap/package-info.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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.
  */
 
 /**
diff --git a/src/main/java/com/yahoo/sketches/kll/KllFloatsQuantileCalculator.java b/src/main/java/com/yahoo/sketches/kll/KllFloatsQuantileCalculator.java
index c9b1eb0..2bc0bb0 100644
--- a/src/main/java/com/yahoo/sketches/kll/KllFloatsQuantileCalculator.java
+++ b/src/main/java/com/yahoo/sketches/kll/KllFloatsQuantileCalculator.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.kll;
diff --git a/src/main/java/com/yahoo/sketches/kll/KllFloatsSketch.java b/src/main/java/com/yahoo/sketches/kll/KllFloatsSketch.java
index ac3313e..9e6a820 100644
--- a/src/main/java/com/yahoo/sketches/kll/KllFloatsSketch.java
+++ b/src/main/java/com/yahoo/sketches/kll/KllFloatsSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.kll;
diff --git a/src/main/java/com/yahoo/sketches/kll/KllFloatsSketchIterator.java b/src/main/java/com/yahoo/sketches/kll/KllFloatsSketchIterator.java
index 78e8575..99c0421 100644
--- a/src/main/java/com/yahoo/sketches/kll/KllFloatsSketchIterator.java
+++ b/src/main/java/com/yahoo/sketches/kll/KllFloatsSketchIterator.java
@@ -1,3 +1,22 @@
+/*
+ * 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 com.yahoo.sketches.kll;
 
 /**
diff --git a/src/main/java/com/yahoo/sketches/kll/KllHelper.java b/src/main/java/com/yahoo/sketches/kll/KllHelper.java
index 3a8b3ec..8894dcb 100644
--- a/src/main/java/com/yahoo/sketches/kll/KllHelper.java
+++ b/src/main/java/com/yahoo/sketches/kll/KllHelper.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.kll;
diff --git a/src/main/java/com/yahoo/sketches/kll/package-info.java b/src/main/java/com/yahoo/sketches/kll/package-info.java
index 642e026..5534726 100644
--- a/src/main/java/com/yahoo/sketches/kll/package-info.java
+++ b/src/main/java/com/yahoo/sketches/kll/package-info.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.kll;
diff --git a/src/main/java/com/yahoo/sketches/package-info.java b/src/main/java/com/yahoo/sketches/package-info.java
index 9988b09..d6f48af 100644
--- a/src/main/java/com/yahoo/sketches/package-info.java
+++ b/src/main/java/com/yahoo/sketches/package-info.java
@@ -1,7 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root
- * for terms.
+ * 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.
  */
 
 /**
diff --git a/src/main/java/com/yahoo/sketches/quantiles/CompactDoublesSketch.java b/src/main/java/com/yahoo/sketches/quantiles/CompactDoublesSketch.java
index 4b716f2..6b38f5d 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/CompactDoublesSketch.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/CompactDoublesSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DirectCompactDoublesSketch.java b/src/main/java/com/yahoo/sketches/quantiles/DirectCompactDoublesSketch.java
index 5f9062b..de03a27 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DirectCompactDoublesSketch.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DirectCompactDoublesSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DirectDoublesSketchAccessor.java b/src/main/java/com/yahoo/sketches/quantiles/DirectDoublesSketchAccessor.java
index 60b17df..c000152 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DirectDoublesSketchAccessor.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DirectDoublesSketchAccessor.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DirectUpdateDoublesSketch.java b/src/main/java/com/yahoo/sketches/quantiles/DirectUpdateDoublesSketch.java
index 25eefb4..a141fcd 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DirectUpdateDoublesSketch.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DirectUpdateDoublesSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DirectUpdateDoublesSketchR.java b/src/main/java/com/yahoo/sketches/quantiles/DirectUpdateDoublesSketchR.java
index 5813bdf..71bba77 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DirectUpdateDoublesSketchR.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DirectUpdateDoublesSketchR.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DoublesArrayAccessor.java b/src/main/java/com/yahoo/sketches/quantiles/DoublesArrayAccessor.java
index b24afda..97fd606 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DoublesArrayAccessor.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DoublesArrayAccessor.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DoublesAuxiliary.java b/src/main/java/com/yahoo/sketches/quantiles/DoublesAuxiliary.java
index 1a67770..658cbac 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DoublesAuxiliary.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DoublesAuxiliary.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DoublesBufferAccessor.java b/src/main/java/com/yahoo/sketches/quantiles/DoublesBufferAccessor.java
index 7da7617..88ee97c 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DoublesBufferAccessor.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DoublesBufferAccessor.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DoublesByteArrayImpl.java b/src/main/java/com/yahoo/sketches/quantiles/DoublesByteArrayImpl.java
index 5948228..84bc1d3 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DoublesByteArrayImpl.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DoublesByteArrayImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DoublesMergeImpl.java b/src/main/java/com/yahoo/sketches/quantiles/DoublesMergeImpl.java
index fbd996b..9822567 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DoublesMergeImpl.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DoublesMergeImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DoublesPmfCdfImpl.java b/src/main/java/com/yahoo/sketches/quantiles/DoublesPmfCdfImpl.java
index 540bfc7..0853c48 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DoublesPmfCdfImpl.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DoublesPmfCdfImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DoublesSketch.java b/src/main/java/com/yahoo/sketches/quantiles/DoublesSketch.java
index e71b095..5706e0a 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DoublesSketch.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DoublesSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DoublesSketchAccessor.java b/src/main/java/com/yahoo/sketches/quantiles/DoublesSketchAccessor.java
index 6c091ad..5152639 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DoublesSketchAccessor.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DoublesSketchAccessor.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DoublesSketchBuilder.java b/src/main/java/com/yahoo/sketches/quantiles/DoublesSketchBuilder.java
index 89555ff..bf9d68a 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DoublesSketchBuilder.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DoublesSketchBuilder.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DoublesSketchIterator.java b/src/main/java/com/yahoo/sketches/quantiles/DoublesSketchIterator.java
index 2664394..0e13a18 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DoublesSketchIterator.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DoublesSketchIterator.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DoublesUnion.java b/src/main/java/com/yahoo/sketches/quantiles/DoublesUnion.java
index 20d831c..04f31cf 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DoublesUnion.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DoublesUnion.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DoublesUnionBuilder.java b/src/main/java/com/yahoo/sketches/quantiles/DoublesUnionBuilder.java
index cd46e04..0bff5e1 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DoublesUnionBuilder.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DoublesUnionBuilder.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DoublesUnionImpl.java b/src/main/java/com/yahoo/sketches/quantiles/DoublesUnionImpl.java
index 65f1d54..e1e5836 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DoublesUnionImpl.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DoublesUnionImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DoublesUnionImplR.java b/src/main/java/com/yahoo/sketches/quantiles/DoublesUnionImplR.java
index 7b6a549..934b434 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DoublesUnionImplR.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DoublesUnionImplR.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DoublesUpdateImpl.java b/src/main/java/com/yahoo/sketches/quantiles/DoublesUpdateImpl.java
index 9224cf3..d417793 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DoublesUpdateImpl.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DoublesUpdateImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/DoublesUtil.java b/src/main/java/com/yahoo/sketches/quantiles/DoublesUtil.java
index 8d4b2eb..82f53c3 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/DoublesUtil.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/DoublesUtil.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/HeapCompactDoublesSketch.java b/src/main/java/com/yahoo/sketches/quantiles/HeapCompactDoublesSketch.java
index 4e8b76f..c16f3d8 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/HeapCompactDoublesSketch.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/HeapCompactDoublesSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/HeapDoublesSketchAccessor.java b/src/main/java/com/yahoo/sketches/quantiles/HeapDoublesSketchAccessor.java
index e930cda..81e0dc3 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/HeapDoublesSketchAccessor.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/HeapDoublesSketchAccessor.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/HeapUpdateDoublesSketch.java b/src/main/java/com/yahoo/sketches/quantiles/HeapUpdateDoublesSketch.java
index aca1eb4..7e83ba2 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/HeapUpdateDoublesSketch.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/HeapUpdateDoublesSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/ItemsAuxiliary.java b/src/main/java/com/yahoo/sketches/quantiles/ItemsAuxiliary.java
index 9907caa..3c4827c 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/ItemsAuxiliary.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/ItemsAuxiliary.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/ItemsByteArrayImpl.java b/src/main/java/com/yahoo/sketches/quantiles/ItemsByteArrayImpl.java
index 4398fb2..58d0c32 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/ItemsByteArrayImpl.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/ItemsByteArrayImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/ItemsMergeImpl.java b/src/main/java/com/yahoo/sketches/quantiles/ItemsMergeImpl.java
index c1293e7..fe4788d 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/ItemsMergeImpl.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/ItemsMergeImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/ItemsPmfCdfImpl.java b/src/main/java/com/yahoo/sketches/quantiles/ItemsPmfCdfImpl.java
index 55f4883..05c3ad5 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/ItemsPmfCdfImpl.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/ItemsPmfCdfImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/ItemsSketch.java b/src/main/java/com/yahoo/sketches/quantiles/ItemsSketch.java
index 6ad977a..aeebea8 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/ItemsSketch.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/ItemsSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/ItemsSketchIterator.java b/src/main/java/com/yahoo/sketches/quantiles/ItemsSketchIterator.java
index 2f3be73..7117e8f 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/ItemsSketchIterator.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/ItemsSketchIterator.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/ItemsUnion.java b/src/main/java/com/yahoo/sketches/quantiles/ItemsUnion.java
index ab8d41b..cc30d83 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/ItemsUnion.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/ItemsUnion.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/ItemsUpdateImpl.java b/src/main/java/com/yahoo/sketches/quantiles/ItemsUpdateImpl.java
index dc0c1d9..22be825 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/ItemsUpdateImpl.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/ItemsUpdateImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/ItemsUtil.java b/src/main/java/com/yahoo/sketches/quantiles/ItemsUtil.java
index 990dd45..205d8d2 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/ItemsUtil.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/ItemsUtil.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/PreambleUtil.java b/src/main/java/com/yahoo/sketches/quantiles/PreambleUtil.java
index f8fa87d..65796d1 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/PreambleUtil.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/PreambleUtil.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/UpdateDoublesSketch.java b/src/main/java/com/yahoo/sketches/quantiles/UpdateDoublesSketch.java
index 0f34fda..0278805 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/UpdateDoublesSketch.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/UpdateDoublesSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/Util.java b/src/main/java/com/yahoo/sketches/quantiles/Util.java
index 3fc6abf..fdffdbe 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/Util.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/Util.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/main/java/com/yahoo/sketches/quantiles/package-info.java b/src/main/java/com/yahoo/sketches/quantiles/package-info.java
index c78ce15..665dd61 100644
--- a/src/main/java/com/yahoo/sketches/quantiles/package-info.java
+++ b/src/main/java/com/yahoo/sketches/quantiles/package-info.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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.
  */
 
 /**
diff --git a/src/main/java/com/yahoo/sketches/sampling/PreambleUtil.java b/src/main/java/com/yahoo/sketches/sampling/PreambleUtil.java
index a45d5b4..687b937 100644
--- a/src/main/java/com/yahoo/sketches/sampling/PreambleUtil.java
+++ b/src/main/java/com/yahoo/sketches/sampling/PreambleUtil.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016-17, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.sampling;
diff --git a/src/main/java/com/yahoo/sketches/sampling/ReservoirItemsSketch.java b/src/main/java/com/yahoo/sketches/sampling/ReservoirItemsSketch.java
index 961e327..bdbb16c 100644
--- a/src/main/java/com/yahoo/sketches/sampling/ReservoirItemsSketch.java
+++ b/src/main/java/com/yahoo/sketches/sampling/ReservoirItemsSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016-17, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.sampling;
diff --git a/src/main/java/com/yahoo/sketches/sampling/ReservoirItemsUnion.java b/src/main/java/com/yahoo/sketches/sampling/ReservoirItemsUnion.java
index a1ce6b1..e6eb6bd 100644
--- a/src/main/java/com/yahoo/sketches/sampling/ReservoirItemsUnion.java
+++ b/src/main/java/com/yahoo/sketches/sampling/ReservoirItemsUnion.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016-17, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.sampling;
diff --git a/src/main/java/com/yahoo/sketches/sampling/ReservoirLongsSketch.java b/src/main/java/com/yahoo/sketches/sampling/ReservoirLongsSketch.java
index 3077995..f242d17 100644
--- a/src/main/java/com/yahoo/sketches/sampling/ReservoirLongsSketch.java
+++ b/src/main/java/com/yahoo/sketches/sampling/ReservoirLongsSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016-17, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.sampling;
diff --git a/src/main/java/com/yahoo/sketches/sampling/ReservoirLongsUnion.java b/src/main/java/com/yahoo/sketches/sampling/ReservoirLongsUnion.java
index 6370853..1786ed7 100644
--- a/src/main/java/com/yahoo/sketches/sampling/ReservoirLongsUnion.java
+++ b/src/main/java/com/yahoo/sketches/sampling/ReservoirLongsUnion.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016-17, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.sampling;
diff --git a/src/main/java/com/yahoo/sketches/sampling/ReservoirSize.java b/src/main/java/com/yahoo/sketches/sampling/ReservoirSize.java
index 602949b..4e87e0a 100644
--- a/src/main/java/com/yahoo/sketches/sampling/ReservoirSize.java
+++ b/src/main/java/com/yahoo/sketches/sampling/ReservoirSize.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016-17, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.sampling;
diff --git a/src/main/java/com/yahoo/sketches/sampling/SampleSubsetSummary.java b/src/main/java/com/yahoo/sketches/sampling/SampleSubsetSummary.java
index cdd97d2..a56db37 100644
--- a/src/main/java/com/yahoo/sketches/sampling/SampleSubsetSummary.java
+++ b/src/main/java/com/yahoo/sketches/sampling/SampleSubsetSummary.java
@@ -1,3 +1,22 @@
+/*
+ * 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 com.yahoo.sketches.sampling;
 
 /**
diff --git a/src/main/java/com/yahoo/sketches/sampling/SamplingUtil.java b/src/main/java/com/yahoo/sketches/sampling/SamplingUtil.java
index 37e0dce..3022328 100644
--- a/src/main/java/com/yahoo/sketches/sampling/SamplingUtil.java
+++ b/src/main/java/com/yahoo/sketches/sampling/SamplingUtil.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016-17, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.sampling;
diff --git a/src/main/java/com/yahoo/sketches/sampling/VarOptItemsSamples.java b/src/main/java/com/yahoo/sketches/sampling/VarOptItemsSamples.java
index 449da1b..58cc4f1 100644
--- a/src/main/java/com/yahoo/sketches/sampling/VarOptItemsSamples.java
+++ b/src/main/java/com/yahoo/sketches/sampling/VarOptItemsSamples.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016-17, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.sampling;
diff --git a/src/main/java/com/yahoo/sketches/sampling/VarOptItemsSketch.java b/src/main/java/com/yahoo/sketches/sampling/VarOptItemsSketch.java
index 2843a4c..45f6ec6 100644
--- a/src/main/java/com/yahoo/sketches/sampling/VarOptItemsSketch.java
+++ b/src/main/java/com/yahoo/sketches/sampling/VarOptItemsSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016-17, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.sampling;
diff --git a/src/main/java/com/yahoo/sketches/sampling/VarOptItemsUnion.java b/src/main/java/com/yahoo/sketches/sampling/VarOptItemsUnion.java
index 93aa4e9..76df6f4 100644
--- a/src/main/java/com/yahoo/sketches/sampling/VarOptItemsUnion.java
+++ b/src/main/java/com/yahoo/sketches/sampling/VarOptItemsUnion.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.sampling;
diff --git a/src/main/java/com/yahoo/sketches/sampling/package-info.java b/src/main/java/com/yahoo/sketches/sampling/package-info.java
index f8c4cd0..a73ff99 100644
--- a/src/main/java/com/yahoo/sketches/sampling/package-info.java
+++ b/src/main/java/com/yahoo/sketches/sampling/package-info.java
@@ -1,7 +1,20 @@
 /*
- * Copyright 2016-17, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root
- * for terms.
+ * 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.
  */
 
 /**
diff --git a/src/main/java/com/yahoo/sketches/theta/AnotB.java b/src/main/java/com/yahoo/sketches/theta/AnotB.java
index f4e2d92..f6f4669 100644
--- a/src/main/java/com/yahoo/sketches/theta/AnotB.java
+++ b/src/main/java/com/yahoo/sketches/theta/AnotB.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/CompactSketch.java b/src/main/java/com/yahoo/sketches/theta/CompactSketch.java
index bc9b5b1..ae896e9 100644
--- a/src/main/java/com/yahoo/sketches/theta/CompactSketch.java
+++ b/src/main/java/com/yahoo/sketches/theta/CompactSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/ConcurrentBackgroundThetaPropagation.java b/src/main/java/com/yahoo/sketches/theta/ConcurrentBackgroundThetaPropagation.java
index 12cc142..0c39661 100644
--- a/src/main/java/com/yahoo/sketches/theta/ConcurrentBackgroundThetaPropagation.java
+++ b/src/main/java/com/yahoo/sketches/theta/ConcurrentBackgroundThetaPropagation.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/ConcurrentDirectQuickSelectSketch.java b/src/main/java/com/yahoo/sketches/theta/ConcurrentDirectQuickSelectSketch.java
index 2354934..734621f 100644
--- a/src/main/java/com/yahoo/sketches/theta/ConcurrentDirectQuickSelectSketch.java
+++ b/src/main/java/com/yahoo/sketches/theta/ConcurrentDirectQuickSelectSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/ConcurrentHeapQuickSelectSketch.java b/src/main/java/com/yahoo/sketches/theta/ConcurrentHeapQuickSelectSketch.java
index a63e385..c128d93 100644
--- a/src/main/java/com/yahoo/sketches/theta/ConcurrentHeapQuickSelectSketch.java
+++ b/src/main/java/com/yahoo/sketches/theta/ConcurrentHeapQuickSelectSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/ConcurrentHeapThetaBuffer.java b/src/main/java/com/yahoo/sketches/theta/ConcurrentHeapThetaBuffer.java
index 80de35e..90b3e84 100644
--- a/src/main/java/com/yahoo/sketches/theta/ConcurrentHeapThetaBuffer.java
+++ b/src/main/java/com/yahoo/sketches/theta/ConcurrentHeapThetaBuffer.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/ConcurrentPropagationService.java b/src/main/java/com/yahoo/sketches/theta/ConcurrentPropagationService.java
index b998d49..5b6bff3 100644
--- a/src/main/java/com/yahoo/sketches/theta/ConcurrentPropagationService.java
+++ b/src/main/java/com/yahoo/sketches/theta/ConcurrentPropagationService.java
@@ -1,3 +1,22 @@
+/*
+ * 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 com.yahoo.sketches.theta;
 
 import java.util.concurrent.ExecutorService;
diff --git a/src/main/java/com/yahoo/sketches/theta/ConcurrentSharedThetaSketch.java b/src/main/java/com/yahoo/sketches/theta/ConcurrentSharedThetaSketch.java
index c0ec0cb..da010bf 100644
--- a/src/main/java/com/yahoo/sketches/theta/ConcurrentSharedThetaSketch.java
+++ b/src/main/java/com/yahoo/sketches/theta/ConcurrentSharedThetaSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/DirectCompactOrderedSketch.java b/src/main/java/com/yahoo/sketches/theta/DirectCompactOrderedSketch.java
index 2118253..7973843 100644
--- a/src/main/java/com/yahoo/sketches/theta/DirectCompactOrderedSketch.java
+++ b/src/main/java/com/yahoo/sketches/theta/DirectCompactOrderedSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/DirectCompactSketch.java b/src/main/java/com/yahoo/sketches/theta/DirectCompactSketch.java
index f8a6394..24df841 100644
--- a/src/main/java/com/yahoo/sketches/theta/DirectCompactSketch.java
+++ b/src/main/java/com/yahoo/sketches/theta/DirectCompactSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/DirectCompactUnorderedSketch.java b/src/main/java/com/yahoo/sketches/theta/DirectCompactUnorderedSketch.java
index 44450a8..f05b369 100644
--- a/src/main/java/com/yahoo/sketches/theta/DirectCompactUnorderedSketch.java
+++ b/src/main/java/com/yahoo/sketches/theta/DirectCompactUnorderedSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/DirectQuickSelectSketch.java b/src/main/java/com/yahoo/sketches/theta/DirectQuickSelectSketch.java
index 94b77d6..c03f843 100644
--- a/src/main/java/com/yahoo/sketches/theta/DirectQuickSelectSketch.java
+++ b/src/main/java/com/yahoo/sketches/theta/DirectQuickSelectSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/DirectQuickSelectSketchR.java b/src/main/java/com/yahoo/sketches/theta/DirectQuickSelectSketchR.java
index b74455d..93a6fd1 100644
--- a/src/main/java/com/yahoo/sketches/theta/DirectQuickSelectSketchR.java
+++ b/src/main/java/com/yahoo/sketches/theta/DirectQuickSelectSketchR.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/ForwardCompatibility.java b/src/main/java/com/yahoo/sketches/theta/ForwardCompatibility.java
index dc960ac..59237a1 100644
--- a/src/main/java/com/yahoo/sketches/theta/ForwardCompatibility.java
+++ b/src/main/java/com/yahoo/sketches/theta/ForwardCompatibility.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/HashIterator.java b/src/main/java/com/yahoo/sketches/theta/HashIterator.java
index a938bb1..3282858 100644
--- a/src/main/java/com/yahoo/sketches/theta/HashIterator.java
+++ b/src/main/java/com/yahoo/sketches/theta/HashIterator.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/HeapAlphaSketch.java b/src/main/java/com/yahoo/sketches/theta/HeapAlphaSketch.java
index 01d10b0..00d47d2 100644
--- a/src/main/java/com/yahoo/sketches/theta/HeapAlphaSketch.java
+++ b/src/main/java/com/yahoo/sketches/theta/HeapAlphaSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/HeapAnotB.java b/src/main/java/com/yahoo/sketches/theta/HeapAnotB.java
index e51789f..62ae043 100644
--- a/src/main/java/com/yahoo/sketches/theta/HeapAnotB.java
+++ b/src/main/java/com/yahoo/sketches/theta/HeapAnotB.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/HeapCompactOrderedSketch.java b/src/main/java/com/yahoo/sketches/theta/HeapCompactOrderedSketch.java
index e36cf20..a71d801 100644
--- a/src/main/java/com/yahoo/sketches/theta/HeapCompactOrderedSketch.java
+++ b/src/main/java/com/yahoo/sketches/theta/HeapCompactOrderedSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/HeapCompactSketch.java b/src/main/java/com/yahoo/sketches/theta/HeapCompactSketch.java
index 238cfb4..59dcbf9 100644
--- a/src/main/java/com/yahoo/sketches/theta/HeapCompactSketch.java
+++ b/src/main/java/com/yahoo/sketches/theta/HeapCompactSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/HeapCompactUnorderedSketch.java b/src/main/java/com/yahoo/sketches/theta/HeapCompactUnorderedSketch.java
index 80d5987..b6e640f 100644
--- a/src/main/java/com/yahoo/sketches/theta/HeapCompactUnorderedSketch.java
+++ b/src/main/java/com/yahoo/sketches/theta/HeapCompactUnorderedSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/HeapHashIterator.java b/src/main/java/com/yahoo/sketches/theta/HeapHashIterator.java
index 20a1b69..446731f 100644
--- a/src/main/java/com/yahoo/sketches/theta/HeapHashIterator.java
+++ b/src/main/java/com/yahoo/sketches/theta/HeapHashIterator.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/HeapQuickSelectSketch.java b/src/main/java/com/yahoo/sketches/theta/HeapQuickSelectSketch.java
index 568aae9..9b83795 100644
--- a/src/main/java/com/yahoo/sketches/theta/HeapQuickSelectSketch.java
+++ b/src/main/java/com/yahoo/sketches/theta/HeapQuickSelectSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/HeapUpdateSketch.java b/src/main/java/com/yahoo/sketches/theta/HeapUpdateSketch.java
index 0b6b957..c88ac3c 100644
--- a/src/main/java/com/yahoo/sketches/theta/HeapUpdateSketch.java
+++ b/src/main/java/com/yahoo/sketches/theta/HeapUpdateSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/Intersection.java b/src/main/java/com/yahoo/sketches/theta/Intersection.java
index d4bee3d..2b3a12e 100644
--- a/src/main/java/com/yahoo/sketches/theta/Intersection.java
+++ b/src/main/java/com/yahoo/sketches/theta/Intersection.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/IntersectionImpl.java b/src/main/java/com/yahoo/sketches/theta/IntersectionImpl.java
index efa3643..a1de010 100644
--- a/src/main/java/com/yahoo/sketches/theta/IntersectionImpl.java
+++ b/src/main/java/com/yahoo/sketches/theta/IntersectionImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/IntersectionImplR.java b/src/main/java/com/yahoo/sketches/theta/IntersectionImplR.java
index 816308c..84ac480 100644
--- a/src/main/java/com/yahoo/sketches/theta/IntersectionImplR.java
+++ b/src/main/java/com/yahoo/sketches/theta/IntersectionImplR.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/JaccardSimilarity.java b/src/main/java/com/yahoo/sketches/theta/JaccardSimilarity.java
index fac6038..3bb4982 100644
--- a/src/main/java/com/yahoo/sketches/theta/JaccardSimilarity.java
+++ b/src/main/java/com/yahoo/sketches/theta/JaccardSimilarity.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/MemoryHashIterator.java b/src/main/java/com/yahoo/sketches/theta/MemoryHashIterator.java
index f9f6ae8..bbd5544 100644
--- a/src/main/java/com/yahoo/sketches/theta/MemoryHashIterator.java
+++ b/src/main/java/com/yahoo/sketches/theta/MemoryHashIterator.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/PairwiseSetOperations.java b/src/main/java/com/yahoo/sketches/theta/PairwiseSetOperations.java
index d782512..d9d94e2 100644
--- a/src/main/java/com/yahoo/sketches/theta/PairwiseSetOperations.java
+++ b/src/main/java/com/yahoo/sketches/theta/PairwiseSetOperations.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/PreambleUtil.java b/src/main/java/com/yahoo/sketches/theta/PreambleUtil.java
index c355973..07674c2 100644
--- a/src/main/java/com/yahoo/sketches/theta/PreambleUtil.java
+++ b/src/main/java/com/yahoo/sketches/theta/PreambleUtil.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/Rebuilder.java b/src/main/java/com/yahoo/sketches/theta/Rebuilder.java
index f2ad24d..b5ae2a9 100644
--- a/src/main/java/com/yahoo/sketches/theta/Rebuilder.java
+++ b/src/main/java/com/yahoo/sketches/theta/Rebuilder.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/SetOperation.java b/src/main/java/com/yahoo/sketches/theta/SetOperation.java
index 7c06477..5640880 100644
--- a/src/main/java/com/yahoo/sketches/theta/SetOperation.java
+++ b/src/main/java/com/yahoo/sketches/theta/SetOperation.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/SetOperationBuilder.java b/src/main/java/com/yahoo/sketches/theta/SetOperationBuilder.java
index 38e2ec4..6204e60 100644
--- a/src/main/java/com/yahoo/sketches/theta/SetOperationBuilder.java
+++ b/src/main/java/com/yahoo/sketches/theta/SetOperationBuilder.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/SingleItemSketch.java b/src/main/java/com/yahoo/sketches/theta/SingleItemSketch.java
index b7b6706..eeada11 100644
--- a/src/main/java/com/yahoo/sketches/theta/SingleItemSketch.java
+++ b/src/main/java/com/yahoo/sketches/theta/SingleItemSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/Sketch.java b/src/main/java/com/yahoo/sketches/theta/Sketch.java
index d4d03af..43d332f 100644
--- a/src/main/java/com/yahoo/sketches/theta/Sketch.java
+++ b/src/main/java/com/yahoo/sketches/theta/Sketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/Sketches.java b/src/main/java/com/yahoo/sketches/theta/Sketches.java
index 7f6032c..457b611 100644
--- a/src/main/java/com/yahoo/sketches/theta/Sketches.java
+++ b/src/main/java/com/yahoo/sketches/theta/Sketches.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/Union.java b/src/main/java/com/yahoo/sketches/theta/Union.java
index dbddb7f..5900c4f 100644
--- a/src/main/java/com/yahoo/sketches/theta/Union.java
+++ b/src/main/java/com/yahoo/sketches/theta/Union.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/UnionImpl.java b/src/main/java/com/yahoo/sketches/theta/UnionImpl.java
index 8560634..3b74801 100644
--- a/src/main/java/com/yahoo/sketches/theta/UnionImpl.java
+++ b/src/main/java/com/yahoo/sketches/theta/UnionImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/UpdateReturnState.java b/src/main/java/com/yahoo/sketches/theta/UpdateReturnState.java
index 4881250..96e8b93 100644
--- a/src/main/java/com/yahoo/sketches/theta/UpdateReturnState.java
+++ b/src/main/java/com/yahoo/sketches/theta/UpdateReturnState.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/UpdateSketch.java b/src/main/java/com/yahoo/sketches/theta/UpdateSketch.java
index ef8a8f7..ff4beab 100644
--- a/src/main/java/com/yahoo/sketches/theta/UpdateSketch.java
+++ b/src/main/java/com/yahoo/sketches/theta/UpdateSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/UpdateSketchBuilder.java b/src/main/java/com/yahoo/sketches/theta/UpdateSketchBuilder.java
index 0716300..094f61c 100644
--- a/src/main/java/com/yahoo/sketches/theta/UpdateSketchBuilder.java
+++ b/src/main/java/com/yahoo/sketches/theta/UpdateSketchBuilder.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.theta;
diff --git a/src/main/java/com/yahoo/sketches/theta/package-info.java b/src/main/java/com/yahoo/sketches/theta/package-info.java
index 5c68144..3b9ae45 100644
--- a/src/main/java/com/yahoo/sketches/theta/package-info.java
+++ b/src/main/java/com/yahoo/sketches/theta/package-info.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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.
  */
 
 /**
diff --git a/src/main/java/com/yahoo/sketches/tuple/AnotB.java b/src/main/java/com/yahoo/sketches/tuple/AnotB.java
index 18427b3..280477d 100644
--- a/src/main/java/com/yahoo/sketches/tuple/AnotB.java
+++ b/src/main/java/com/yahoo/sketches/tuple/AnotB.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesAnotB.java b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesAnotB.java
index 88b9437..925d990 100644
--- a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesAnotB.java
+++ b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesAnotB.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesCombiner.java b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesCombiner.java
index 8f7ae18..6f8942b 100644
--- a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesCombiner.java
+++ b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesCombiner.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesCompactSketch.java b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesCompactSketch.java
index 4b2b4e6..9706527 100644
--- a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesCompactSketch.java
+++ b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesCompactSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesIntersection.java b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesIntersection.java
index ff39ca0..c15202b 100644
--- a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesIntersection.java
+++ b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesIntersection.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesQuickSelectSketch.java b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesQuickSelectSketch.java
index 1711560..fe31117 100644
--- a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesQuickSelectSketch.java
+++ b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesQuickSelectSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesSetOperationBuilder.java b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesSetOperationBuilder.java
index 30f7d67..c590977 100644
--- a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesSetOperationBuilder.java
+++ b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesSetOperationBuilder.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesSketch.java b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesSketch.java
index 731935a..1f09230 100644
--- a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesSketch.java
+++ b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesSketchIterator.java b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesSketchIterator.java
index b03d2c8..7a6f98a 100644
--- a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesSketchIterator.java
+++ b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesSketchIterator.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesSketches.java b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesSketches.java
index 81567c8..169a4ee 100644
--- a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesSketches.java
+++ b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesSketches.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesUnion.java b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesUnion.java
index 5b18187..415685f 100644
--- a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesUnion.java
+++ b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesUnion.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesUpdatableSketch.java b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesUpdatableSketch.java
index 702a6fe..712e390 100644
--- a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesUpdatableSketch.java
+++ b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesUpdatableSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesUpdatableSketchBuilder.java b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesUpdatableSketchBuilder.java
index e9d0fa7..5f0deaf 100644
--- a/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesUpdatableSketchBuilder.java
+++ b/src/main/java/com/yahoo/sketches/tuple/ArrayOfDoublesUpdatableSketchBuilder.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/CompactSketch.java b/src/main/java/com/yahoo/sketches/tuple/CompactSketch.java
index 1268bb4..20fdbd2 100644
--- a/src/main/java/com/yahoo/sketches/tuple/CompactSketch.java
+++ b/src/main/java/com/yahoo/sketches/tuple/CompactSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/DeserializeResult.java b/src/main/java/com/yahoo/sketches/tuple/DeserializeResult.java
index e29b99e..3315f59 100644
--- a/src/main/java/com/yahoo/sketches/tuple/DeserializeResult.java
+++ b/src/main/java/com/yahoo/sketches/tuple/DeserializeResult.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesCompactSketch.java b/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesCompactSketch.java
index ad2896d..9e014b4 100644
--- a/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesCompactSketch.java
+++ b/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesCompactSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesIntersection.java b/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesIntersection.java
index 4cb3a65..d72d44d 100644
--- a/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesIntersection.java
+++ b/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesIntersection.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesQuickSelectSketch.java b/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesQuickSelectSketch.java
index d06280f..7f5a8de 100644
--- a/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesQuickSelectSketch.java
+++ b/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesQuickSelectSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesQuickSelectSketchR.java b/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesQuickSelectSketchR.java
index 55ce7fc..76df8c4 100644
--- a/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesQuickSelectSketchR.java
+++ b/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesQuickSelectSketchR.java
@@ -1,3 +1,22 @@
+/*
+ * 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 com.yahoo.sketches.tuple;
 
 import com.yahoo.memory.Memory;
diff --git a/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesSketchIterator.java b/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesSketchIterator.java
index 8dfd5e6..e2ca648 100644
--- a/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesSketchIterator.java
+++ b/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesSketchIterator.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesUnion.java b/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesUnion.java
index f0bf3e2..82e13b9 100644
--- a/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesUnion.java
+++ b/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesUnion.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesUnionR.java b/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesUnionR.java
index ce88a31..a11e218 100644
--- a/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesUnionR.java
+++ b/src/main/java/com/yahoo/sketches/tuple/DirectArrayOfDoublesUnionR.java
@@ -1,3 +1,22 @@
+/*
+ * 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 com.yahoo.sketches.tuple;
 
 import com.yahoo.memory.WritableMemory;
diff --git a/src/main/java/com/yahoo/sketches/tuple/Filter.java b/src/main/java/com/yahoo/sketches/tuple/Filter.java
index 9fb69e2..89a1859 100644
--- a/src/main/java/com/yahoo/sketches/tuple/Filter.java
+++ b/src/main/java/com/yahoo/sketches/tuple/Filter.java
@@ -1,3 +1,22 @@
+/*
+ * 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 com.yahoo.sketches.tuple;
 
 import java.util.function.Predicate;
diff --git a/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesAnotB.java b/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesAnotB.java
index 5cb6724..e0a72bd 100644
--- a/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesAnotB.java
+++ b/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesAnotB.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesCompactSketch.java b/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesCompactSketch.java
index 2b8e706..87b535a 100644
--- a/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesCompactSketch.java
+++ b/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesCompactSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesIntersection.java b/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesIntersection.java
index 8edb0e9..56eb9fc 100644
--- a/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesIntersection.java
+++ b/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesIntersection.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesQuickSelectSketch.java b/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesQuickSelectSketch.java
index 23ba129..640e43c 100644
--- a/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesQuickSelectSketch.java
+++ b/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesQuickSelectSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesSketchIterator.java b/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesSketchIterator.java
index 0859c46..09b38ab 100644
--- a/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesSketchIterator.java
+++ b/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesSketchIterator.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesUnion.java b/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesUnion.java
index a37abcc..7608d43 100644
--- a/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesUnion.java
+++ b/src/main/java/com/yahoo/sketches/tuple/HeapArrayOfDoublesUnion.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/Intersection.java b/src/main/java/com/yahoo/sketches/tuple/Intersection.java
index e492004..e9cef37 100644
--- a/src/main/java/com/yahoo/sketches/tuple/Intersection.java
+++ b/src/main/java/com/yahoo/sketches/tuple/Intersection.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/QuickSelectSketch.java b/src/main/java/com/yahoo/sketches/tuple/QuickSelectSketch.java
index 646e549..79f486d 100644
--- a/src/main/java/com/yahoo/sketches/tuple/QuickSelectSketch.java
+++ b/src/main/java/com/yahoo/sketches/tuple/QuickSelectSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/SerializerDeserializer.java b/src/main/java/com/yahoo/sketches/tuple/SerializerDeserializer.java
index d482275..de59ecb 100644
--- a/src/main/java/com/yahoo/sketches/tuple/SerializerDeserializer.java
+++ b/src/main/java/com/yahoo/sketches/tuple/SerializerDeserializer.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/Sketch.java b/src/main/java/com/yahoo/sketches/tuple/Sketch.java
index 1f60989..ca43448 100644
--- a/src/main/java/com/yahoo/sketches/tuple/Sketch.java
+++ b/src/main/java/com/yahoo/sketches/tuple/Sketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/SketchIterator.java b/src/main/java/com/yahoo/sketches/tuple/SketchIterator.java
index f113ed7..6825b22 100644
--- a/src/main/java/com/yahoo/sketches/tuple/SketchIterator.java
+++ b/src/main/java/com/yahoo/sketches/tuple/SketchIterator.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/Sketches.java b/src/main/java/com/yahoo/sketches/tuple/Sketches.java
index f41cb23..0c9ad02 100644
--- a/src/main/java/com/yahoo/sketches/tuple/Sketches.java
+++ b/src/main/java/com/yahoo/sketches/tuple/Sketches.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/Summary.java b/src/main/java/com/yahoo/sketches/tuple/Summary.java
index de0fff5..8ee5ddc 100644
--- a/src/main/java/com/yahoo/sketches/tuple/Summary.java
+++ b/src/main/java/com/yahoo/sketches/tuple/Summary.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/SummaryDeserializer.java b/src/main/java/com/yahoo/sketches/tuple/SummaryDeserializer.java
index 8c89060..4620be5 100644
--- a/src/main/java/com/yahoo/sketches/tuple/SummaryDeserializer.java
+++ b/src/main/java/com/yahoo/sketches/tuple/SummaryDeserializer.java
@@ -1,3 +1,22 @@
+/*
+ * 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 com.yahoo.sketches.tuple;
 
 import com.yahoo.memory.Memory;
diff --git a/src/main/java/com/yahoo/sketches/tuple/SummaryFactory.java b/src/main/java/com/yahoo/sketches/tuple/SummaryFactory.java
index aab491e..f3d5d0a 100644
--- a/src/main/java/com/yahoo/sketches/tuple/SummaryFactory.java
+++ b/src/main/java/com/yahoo/sketches/tuple/SummaryFactory.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/SummarySetOperations.java b/src/main/java/com/yahoo/sketches/tuple/SummarySetOperations.java
index b2c2627..45fde91 100644
--- a/src/main/java/com/yahoo/sketches/tuple/SummarySetOperations.java
+++ b/src/main/java/com/yahoo/sketches/tuple/SummarySetOperations.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/Union.java b/src/main/java/com/yahoo/sketches/tuple/Union.java
index 558ac2f..8a94519 100644
--- a/src/main/java/com/yahoo/sketches/tuple/Union.java
+++ b/src/main/java/com/yahoo/sketches/tuple/Union.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/UpdatableSketch.java b/src/main/java/com/yahoo/sketches/tuple/UpdatableSketch.java
index 2e85785..b82d2f5 100644
--- a/src/main/java/com/yahoo/sketches/tuple/UpdatableSketch.java
+++ b/src/main/java/com/yahoo/sketches/tuple/UpdatableSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/UpdatableSketchBuilder.java b/src/main/java/com/yahoo/sketches/tuple/UpdatableSketchBuilder.java
index fb5b53e..8f213b9 100644
--- a/src/main/java/com/yahoo/sketches/tuple/UpdatableSketchBuilder.java
+++ b/src/main/java/com/yahoo/sketches/tuple/UpdatableSketchBuilder.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/UpdatableSummary.java b/src/main/java/com/yahoo/sketches/tuple/UpdatableSummary.java
index 08dd7da..5e510b7 100644
--- a/src/main/java/com/yahoo/sketches/tuple/UpdatableSummary.java
+++ b/src/main/java/com/yahoo/sketches/tuple/UpdatableSummary.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/Util.java b/src/main/java/com/yahoo/sketches/tuple/Util.java
index ceb1c3f..aae40ff 100644
--- a/src/main/java/com/yahoo/sketches/tuple/Util.java
+++ b/src/main/java/com/yahoo/sketches/tuple/Util.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple;
diff --git a/src/main/java/com/yahoo/sketches/tuple/adouble/DoubleSummary.java b/src/main/java/com/yahoo/sketches/tuple/adouble/DoubleSummary.java
index dc1149d..86c4feb 100644
--- a/src/main/java/com/yahoo/sketches/tuple/adouble/DoubleSummary.java
+++ b/src/main/java/com/yahoo/sketches/tuple/adouble/DoubleSummary.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple.adouble;
diff --git a/src/main/java/com/yahoo/sketches/tuple/adouble/DoubleSummaryDeserializer.java b/src/main/java/com/yahoo/sketches/tuple/adouble/DoubleSummaryDeserializer.java
index 0a36b46..a519d9d 100644
--- a/src/main/java/com/yahoo/sketches/tuple/adouble/DoubleSummaryDeserializer.java
+++ b/src/main/java/com/yahoo/sketches/tuple/adouble/DoubleSummaryDeserializer.java
@@ -1,3 +1,22 @@
+/*
+ * 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 com.yahoo.sketches.tuple.adouble;
 
 import com.yahoo.memory.Memory;
diff --git a/src/main/java/com/yahoo/sketches/tuple/adouble/DoubleSummaryFactory.java b/src/main/java/com/yahoo/sketches/tuple/adouble/DoubleSummaryFactory.java
index c073249..106a7dd 100644
--- a/src/main/java/com/yahoo/sketches/tuple/adouble/DoubleSummaryFactory.java
+++ b/src/main/java/com/yahoo/sketches/tuple/adouble/DoubleSummaryFactory.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple.adouble;
diff --git a/src/main/java/com/yahoo/sketches/tuple/adouble/DoubleSummarySetOperations.java b/src/main/java/com/yahoo/sketches/tuple/adouble/DoubleSummarySetOperations.java
index d74af68..2f8dafd 100644
--- a/src/main/java/com/yahoo/sketches/tuple/adouble/DoubleSummarySetOperations.java
+++ b/src/main/java/com/yahoo/sketches/tuple/adouble/DoubleSummarySetOperations.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple.adouble;
diff --git a/src/main/java/com/yahoo/sketches/tuple/adouble/package-info.java b/src/main/java/com/yahoo/sketches/tuple/adouble/package-info.java
index 4cc4f57..6e976c8 100644
--- a/src/main/java/com/yahoo/sketches/tuple/adouble/package-info.java
+++ b/src/main/java/com/yahoo/sketches/tuple/adouble/package-info.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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.
  */
 
 /**
diff --git a/src/main/java/com/yahoo/sketches/tuple/package-info.java b/src/main/java/com/yahoo/sketches/tuple/package-info.java
index 378189c..90af078 100644
--- a/src/main/java/com/yahoo/sketches/tuple/package-info.java
+++ b/src/main/java/com/yahoo/sketches/tuple/package-info.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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.
  */
 
 /**
diff --git a/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSketch.java b/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSketch.java
index 0857e08..a599d5f 100644
--- a/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSketch.java
+++ b/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSketch.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple.strings;
diff --git a/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSummary.java b/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSummary.java
index 14c725b..f6c879a 100644
--- a/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSummary.java
+++ b/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSummary.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple.strings;
diff --git a/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSummaryDeserializer.java b/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSummaryDeserializer.java
index 2bd8317..86b5c58 100644
--- a/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSummaryDeserializer.java
+++ b/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSummaryDeserializer.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple.strings;
diff --git a/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSummaryFactory.java b/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSummaryFactory.java
index 47c25b6..4de6c7d 100644
--- a/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSummaryFactory.java
+++ b/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSummaryFactory.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple.strings;
diff --git a/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSummarySetOperations.java b/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSummarySetOperations.java
index 1f55594..94c91c5 100644
--- a/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSummarySetOperations.java
+++ b/src/main/java/com/yahoo/sketches/tuple/strings/ArrayOfStringsSummarySetOperations.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.tuple.strings;
diff --git a/src/main/java/com/yahoo/sketches/tuple/strings/package-info.java b/src/main/java/com/yahoo/sketches/tuple/strings/package-info.java
index 9256fc9..c6bfd1c 100644
--- a/src/main/java/com/yahoo/sketches/tuple/strings/package-info.java
+++ b/src/main/java/com/yahoo/sketches/tuple/strings/package-info.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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.
  */
 
 /**
diff --git a/src/test/java/com/yahoo/sketches/BinomialBoundsNTest.java b/src/test/java/com/yahoo/sketches/BinomialBoundsNTest.java
index 8282e97..1a9b4b5 100644
--- a/src/test/java/com/yahoo/sketches/BinomialBoundsNTest.java
+++ b/src/test/java/com/yahoo/sketches/BinomialBoundsNTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/test/java/com/yahoo/sketches/BoundsOnBinomialProportionsTest.java b/src/test/java/com/yahoo/sketches/BoundsOnBinomialProportionsTest.java
index 7ee3d4e..8521112 100644
--- a/src/test/java/com/yahoo/sketches/BoundsOnBinomialProportionsTest.java
+++ b/src/test/java/com/yahoo/sketches/BoundsOnBinomialProportionsTest.java
@@ -1,7 +1,22 @@
 /*
- * Copyright 2016, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
 
 import static com.yahoo.sketches.BoundsOnBinomialProportions.approximateLowerBoundOnP;
diff --git a/src/test/java/com/yahoo/sketches/BoundsOnRatiosInSampledSetsTest.java b/src/test/java/com/yahoo/sketches/BoundsOnRatiosInSampledSetsTest.java
index 17df2c5..2eab03f 100644
--- a/src/test/java/com/yahoo/sketches/BoundsOnRatiosInSampledSetsTest.java
+++ b/src/test/java/com/yahoo/sketches/BoundsOnRatiosInSampledSetsTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/test/java/com/yahoo/sketches/BoundsOnRatiosInThetaSketchedSetsTest.java b/src/test/java/com/yahoo/sketches/BoundsOnRatiosInThetaSketchedSetsTest.java
index db8b846..be9445f 100644
--- a/src/test/java/com/yahoo/sketches/BoundsOnRatiosInThetaSketchedSetsTest.java
+++ b/src/test/java/com/yahoo/sketches/BoundsOnRatiosInThetaSketchedSetsTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/test/java/com/yahoo/sketches/ByteArrayUtilTest.java b/src/test/java/com/yahoo/sketches/ByteArrayUtilTest.java
index ee99585..72c16ea 100644
--- a/src/test/java/com/yahoo/sketches/ByteArrayUtilTest.java
+++ b/src/test/java/com/yahoo/sketches/ByteArrayUtilTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/test/java/com/yahoo/sketches/FamilyTest.java b/src/test/java/com/yahoo/sketches/FamilyTest.java
index ff20c3c..a0be2e5 100644
--- a/src/test/java/com/yahoo/sketches/FamilyTest.java
+++ b/src/test/java/com/yahoo/sketches/FamilyTest.java
@@ -1,7 +1,22 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
 
 import static com.yahoo.sketches.Family.idToFamily;
diff --git a/src/test/java/com/yahoo/sketches/HashOperationsTest.java b/src/test/java/com/yahoo/sketches/HashOperationsTest.java
index 309b8b9..f913ad8 100644
--- a/src/test/java/com/yahoo/sketches/HashOperationsTest.java
+++ b/src/test/java/com/yahoo/sketches/HashOperationsTest.java
@@ -1,7 +1,22 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
 
 import static com.yahoo.sketches.HashOperations.checkHashCorruption;
diff --git a/src/test/java/com/yahoo/sketches/QuickSelectTest.java b/src/test/java/com/yahoo/sketches/QuickSelectTest.java
index 4a26be0..8fb6dd7 100644
--- a/src/test/java/com/yahoo/sketches/QuickSelectTest.java
+++ b/src/test/java/com/yahoo/sketches/QuickSelectTest.java
@@ -1,7 +1,22 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
 
 import static com.yahoo.sketches.QuickSelect.select;
diff --git a/src/test/java/com/yahoo/sketches/SketchesExceptionTest.java b/src/test/java/com/yahoo/sketches/SketchesExceptionTest.java
index 94aca54..b545a9d 100644
--- a/src/test/java/com/yahoo/sketches/SketchesExceptionTest.java
+++ b/src/test/java/com/yahoo/sketches/SketchesExceptionTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
diff --git a/src/test/java/com/yahoo/sketches/UtilTest.java b/src/test/java/com/yahoo/sketches/UtilTest.java
index 91142a0..67b2eaa 100644
--- a/src/test/java/com/yahoo/sketches/UtilTest.java
+++ b/src/test/java/com/yahoo/sketches/UtilTest.java
@@ -1,7 +1,22 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches;
 
 import static com.yahoo.sketches.Util.bytesToInt;
diff --git a/src/test/java/com/yahoo/sketches/cpc/BitMatrix.java b/src/test/java/com/yahoo/sketches/cpc/BitMatrix.java
index b72185f..13a2ebf 100644
--- a/src/test/java/com/yahoo/sketches/cpc/BitMatrix.java
+++ b/src/test/java/com/yahoo/sketches/cpc/BitMatrix.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/CompressedStateTest.java b/src/test/java/com/yahoo/sketches/cpc/CompressedStateTest.java
index 5b84e84..55c22d6 100644
--- a/src/test/java/com/yahoo/sketches/cpc/CompressedStateTest.java
+++ b/src/test/java/com/yahoo/sketches/cpc/CompressedStateTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/CompressionCharacterization.java b/src/test/java/com/yahoo/sketches/cpc/CompressionCharacterization.java
index 507b950..0a276e6 100644
--- a/src/test/java/com/yahoo/sketches/cpc/CompressionCharacterization.java
+++ b/src/test/java/com/yahoo/sketches/cpc/CompressionCharacterization.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/CompressionDataTest.java b/src/test/java/com/yahoo/sketches/cpc/CompressionDataTest.java
index 7f0c1c4..642fbfc 100644
--- a/src/test/java/com/yahoo/sketches/cpc/CompressionDataTest.java
+++ b/src/test/java/com/yahoo/sketches/cpc/CompressionDataTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/CpcCBinariesTest.java b/src/test/java/com/yahoo/sketches/cpc/CpcCBinariesTest.java
index 6669a04..f75fc5a 100644
--- a/src/test/java/com/yahoo/sketches/cpc/CpcCBinariesTest.java
+++ b/src/test/java/com/yahoo/sketches/cpc/CpcCBinariesTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/CpcCompressionTest.java b/src/test/java/com/yahoo/sketches/cpc/CpcCompressionTest.java
index d6b3032..c7dd113 100644
--- a/src/test/java/com/yahoo/sketches/cpc/CpcCompressionTest.java
+++ b/src/test/java/com/yahoo/sketches/cpc/CpcCompressionTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/CpcSketchTest.java b/src/test/java/com/yahoo/sketches/cpc/CpcSketchTest.java
index 0140d45..6e71b81 100644
--- a/src/test/java/com/yahoo/sketches/cpc/CpcSketchTest.java
+++ b/src/test/java/com/yahoo/sketches/cpc/CpcSketchTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/CpcUnionTest.java b/src/test/java/com/yahoo/sketches/cpc/CpcUnionTest.java
index 8c14822..4c428b9 100644
--- a/src/test/java/com/yahoo/sketches/cpc/CpcUnionTest.java
+++ b/src/test/java/com/yahoo/sketches/cpc/CpcUnionTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/CpcWrapperTest.java b/src/test/java/com/yahoo/sketches/cpc/CpcWrapperTest.java
index 728eb10..20cbcbe 100644
--- a/src/test/java/com/yahoo/sketches/cpc/CpcWrapperTest.java
+++ b/src/test/java/com/yahoo/sketches/cpc/CpcWrapperTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/IconEstimatorTest.java b/src/test/java/com/yahoo/sketches/cpc/IconEstimatorTest.java
index 3d1d75a..2890945 100644
--- a/src/test/java/com/yahoo/sketches/cpc/IconEstimatorTest.java
+++ b/src/test/java/com/yahoo/sketches/cpc/IconEstimatorTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/LzTzSpeedTesting.java b/src/test/java/com/yahoo/sketches/cpc/LzTzSpeedTesting.java
index 7b6f422..1836bed 100644
--- a/src/test/java/com/yahoo/sketches/cpc/LzTzSpeedTesting.java
+++ b/src/test/java/com/yahoo/sketches/cpc/LzTzSpeedTesting.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/MergingValidation.java b/src/test/java/com/yahoo/sketches/cpc/MergingValidation.java
index 315a587..01f9ef2 100644
--- a/src/test/java/com/yahoo/sketches/cpc/MergingValidation.java
+++ b/src/test/java/com/yahoo/sketches/cpc/MergingValidation.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/PairTableTest.java b/src/test/java/com/yahoo/sketches/cpc/PairTableTest.java
index 7337905..7cc67a2 100644
--- a/src/test/java/com/yahoo/sketches/cpc/PairTableTest.java
+++ b/src/test/java/com/yahoo/sketches/cpc/PairTableTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/PreambleUtilTest.java b/src/test/java/com/yahoo/sketches/cpc/PreambleUtilTest.java
index 3c6b246..e707b83 100644
--- a/src/test/java/com/yahoo/sketches/cpc/PreambleUtilTest.java
+++ b/src/test/java/com/yahoo/sketches/cpc/PreambleUtilTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/QuickMergingValidation.java b/src/test/java/com/yahoo/sketches/cpc/QuickMergingValidation.java
index 78d7ce6..7911af7 100644
--- a/src/test/java/com/yahoo/sketches/cpc/QuickMergingValidation.java
+++ b/src/test/java/com/yahoo/sketches/cpc/QuickMergingValidation.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/RuntimeAssertsTest.java b/src/test/java/com/yahoo/sketches/cpc/RuntimeAssertsTest.java
index b566ef2..23ccdbf 100644
--- a/src/test/java/com/yahoo/sketches/cpc/RuntimeAssertsTest.java
+++ b/src/test/java/com/yahoo/sketches/cpc/RuntimeAssertsTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/SpecialCBinariesTest.java b/src/test/java/com/yahoo/sketches/cpc/SpecialCBinariesTest.java
index a5dda69..fbadd0e 100644
--- a/src/test/java/com/yahoo/sketches/cpc/SpecialCBinariesTest.java
+++ b/src/test/java/com/yahoo/sketches/cpc/SpecialCBinariesTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/StreamingValidation.java b/src/test/java/com/yahoo/sketches/cpc/StreamingValidation.java
index dd5a763..29cce1b 100644
--- a/src/test/java/com/yahoo/sketches/cpc/StreamingValidation.java
+++ b/src/test/java/com/yahoo/sketches/cpc/StreamingValidation.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/TestAllTest.java b/src/test/java/com/yahoo/sketches/cpc/TestAllTest.java
index 786d1e4..6701a6d 100644
--- a/src/test/java/com/yahoo/sketches/cpc/TestAllTest.java
+++ b/src/test/java/com/yahoo/sketches/cpc/TestAllTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/cpc/TestUtil.java b/src/test/java/com/yahoo/sketches/cpc/TestUtil.java
index aa97c68..ca0e04f 100644
--- a/src/test/java/com/yahoo/sketches/cpc/TestUtil.java
+++ b/src/test/java/com/yahoo/sketches/cpc/TestUtil.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.cpc;
diff --git a/src/test/java/com/yahoo/sketches/fdt/FdtSketchTest.java b/src/test/java/com/yahoo/sketches/fdt/FdtSketchTest.java
index c7b873a..6a8ac7c 100644
--- a/src/test/java/com/yahoo/sketches/fdt/FdtSketchTest.java
+++ b/src/test/java/com/yahoo/sketches/fdt/FdtSketchTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.fdt;
diff --git a/src/test/java/com/yahoo/sketches/fdt/GroupTest.java b/src/test/java/com/yahoo/sketches/fdt/GroupTest.java
index dda793c..b274f85 100644
--- a/src/test/java/com/yahoo/sketches/fdt/GroupTest.java
+++ b/src/test/java/com/yahoo/sketches/fdt/GroupTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.fdt;
diff --git a/src/test/java/com/yahoo/sketches/frequencies/DistTest.java b/src/test/java/com/yahoo/sketches/frequencies/DistTest.java
index 2400d65..22f6acf 100644
--- a/src/test/java/com/yahoo/sketches/frequencies/DistTest.java
+++ b/src/test/java/com/yahoo/sketches/frequencies/DistTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.frequencies;
diff --git a/src/test/java/com/yahoo/sketches/frequencies/ItemsSketchTest.java b/src/test/java/com/yahoo/sketches/frequencies/ItemsSketchTest.java
index 47be63e..6c202bd 100644
--- a/src/test/java/com/yahoo/sketches/frequencies/ItemsSketchTest.java
+++ b/src/test/java/com/yahoo/sketches/frequencies/ItemsSketchTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.frequencies;
diff --git a/src/test/java/com/yahoo/sketches/frequencies/LongsSketchTest.java b/src/test/java/com/yahoo/sketches/frequencies/LongsSketchTest.java
index c3a5692..78fd09d 100644
--- a/src/test/java/com/yahoo/sketches/frequencies/LongsSketchTest.java
+++ b/src/test/java/com/yahoo/sketches/frequencies/LongsSketchTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.frequencies;
diff --git a/src/test/java/com/yahoo/sketches/frequencies/ReversePurgeLongHashMapTest.java b/src/test/java/com/yahoo/sketches/frequencies/ReversePurgeLongHashMapTest.java
index e703551..f76a7d6 100644
--- a/src/test/java/com/yahoo/sketches/frequencies/ReversePurgeLongHashMapTest.java
+++ b/src/test/java/com/yahoo/sketches/frequencies/ReversePurgeLongHashMapTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.frequencies;
diff --git a/src/test/java/com/yahoo/sketches/frequencies/SerDeCompatibilityTest.java b/src/test/java/com/yahoo/sketches/frequencies/SerDeCompatibilityTest.java
index c122d2d..fb9c5fd 100644
--- a/src/test/java/com/yahoo/sketches/frequencies/SerDeCompatibilityTest.java
+++ b/src/test/java/com/yahoo/sketches/frequencies/SerDeCompatibilityTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.frequencies;
diff --git a/src/test/java/com/yahoo/sketches/frequencies/StressTestHashMap.java b/src/test/java/com/yahoo/sketches/frequencies/StressTestHashMap.java
index 0fdb18a..3bc9b57 100644
--- a/src/test/java/com/yahoo/sketches/frequencies/StressTestHashMap.java
+++ b/src/test/java/com/yahoo/sketches/frequencies/StressTestHashMap.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the Apache License 2.0. See LICENSE file
- * at the project root for terms.
+ * 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 com.yahoo.sketches.frequencies;
diff --git a/src/test/java/com/yahoo/sketches/hash/MurmurHash3AdaptorTest.java b/src/test/java/com/yahoo/sketches/hash/MurmurHash3AdaptorTest.java
index 9a95351..0b2a39d 100644
--- a/src/test/java/com/yahoo/sketches/hash/MurmurHash3AdaptorTest.java
+++ b/src/test/java/com/yahoo/sketches/hash/MurmurHash3AdaptorTest.java
@@ -1,7 +1,22 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hash;
 
 import static com.yahoo.sketches.hash.MurmurHash3Adaptor.asDouble;
diff --git a/src/test/java/com/yahoo/sketches/hash/MurmurHash3Test.java b/src/test/java/com/yahoo/sketches/hash/MurmurHash3Test.java
index 0df779e..554ec39 100644
--- a/src/test/java/com/yahoo/sketches/hash/MurmurHash3Test.java
+++ b/src/test/java/com/yahoo/sketches/hash/MurmurHash3Test.java
@@ -1,7 +1,22 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hash;
 
 import static com.yahoo.sketches.hash.MurmurHash3.hash;
diff --git a/src/test/java/com/yahoo/sketches/hash/MurmurHash3v2Test.java b/src/test/java/com/yahoo/sketches/hash/MurmurHash3v2Test.java
index 90c0fb6..b4d95cb 100644
--- a/src/test/java/com/yahoo/sketches/hash/MurmurHash3v2Test.java
+++ b/src/test/java/com/yahoo/sketches/hash/MurmurHash3v2Test.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hash;
diff --git a/src/test/java/com/yahoo/sketches/hash/XxHashTest.java b/src/test/java/com/yahoo/sketches/hash/XxHashTest.java
index 8131377..50581d8 100644
--- a/src/test/java/com/yahoo/sketches/hash/XxHashTest.java
+++ b/src/test/java/com/yahoo/sketches/hash/XxHashTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hash;
diff --git a/src/test/java/com/yahoo/sketches/hll/AuxHashMapTest.java b/src/test/java/com/yahoo/sketches/hll/AuxHashMapTest.java
index aacc1bf..cb9427b 100644
--- a/src/test/java/com/yahoo/sketches/hll/AuxHashMapTest.java
+++ b/src/test/java/com/yahoo/sketches/hll/AuxHashMapTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/test/java/com/yahoo/sketches/hll/BaseHllSketchTest.java b/src/test/java/com/yahoo/sketches/hll/BaseHllSketchTest.java
index 1688b36..6e967fa 100644
--- a/src/test/java/com/yahoo/sketches/hll/BaseHllSketchTest.java
+++ b/src/test/java/com/yahoo/sketches/hll/BaseHllSketchTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/test/java/com/yahoo/sketches/hll/CouponListTest.java b/src/test/java/com/yahoo/sketches/hll/CouponListTest.java
index 1e1bb4d..c29bac6 100644
--- a/src/test/java/com/yahoo/sketches/hll/CouponListTest.java
+++ b/src/test/java/com/yahoo/sketches/hll/CouponListTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/test/java/com/yahoo/sketches/hll/CrossCountingTest.java b/src/test/java/com/yahoo/sketches/hll/CrossCountingTest.java
index 6ab3cdc..874995f 100644
--- a/src/test/java/com/yahoo/sketches/hll/CrossCountingTest.java
+++ b/src/test/java/com/yahoo/sketches/hll/CrossCountingTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/test/java/com/yahoo/sketches/hll/DirectAuxHashMapTest.java b/src/test/java/com/yahoo/sketches/hll/DirectAuxHashMapTest.java
index 4ceffbc..09e1f5e 100644
--- a/src/test/java/com/yahoo/sketches/hll/DirectAuxHashMapTest.java
+++ b/src/test/java/com/yahoo/sketches/hll/DirectAuxHashMapTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/test/java/com/yahoo/sketches/hll/DirectCouponListTest.java b/src/test/java/com/yahoo/sketches/hll/DirectCouponListTest.java
index bc32130..3466b65 100644
--- a/src/test/java/com/yahoo/sketches/hll/DirectCouponListTest.java
+++ b/src/test/java/com/yahoo/sketches/hll/DirectCouponListTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/test/java/com/yahoo/sketches/hll/DirectHllSketchTest.java b/src/test/java/com/yahoo/sketches/hll/DirectHllSketchTest.java
index febb798..e5d8f47 100644
--- a/src/test/java/com/yahoo/sketches/hll/DirectHllSketchTest.java
+++ b/src/test/java/com/yahoo/sketches/hll/DirectHllSketchTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/test/java/com/yahoo/sketches/hll/DirectUnionCaseTest.java b/src/test/java/com/yahoo/sketches/hll/DirectUnionCaseTest.java
index 6bc6276..27ba028 100644
--- a/src/test/java/com/yahoo/sketches/hll/DirectUnionCaseTest.java
+++ b/src/test/java/com/yahoo/sketches/hll/DirectUnionCaseTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/test/java/com/yahoo/sketches/hll/DirectUnionTest.java b/src/test/java/com/yahoo/sketches/hll/DirectUnionTest.java
index 1ce3a87..70a3024 100644
--- a/src/test/java/com/yahoo/sketches/hll/DirectUnionTest.java
+++ b/src/test/java/com/yahoo/sketches/hll/DirectUnionTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/test/java/com/yahoo/sketches/hll/HllArrayTest.java b/src/test/java/com/yahoo/sketches/hll/HllArrayTest.java
index 5fe635c..504a08c 100644
--- a/src/test/java/com/yahoo/sketches/hll/HllArrayTest.java
+++ b/src/test/java/com/yahoo/sketches/hll/HllArrayTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/test/java/com/yahoo/sketches/hll/HllSketchTest.java b/src/test/java/com/yahoo/sketches/hll/HllSketchTest.java
index 986d8cc..e94045d 100644
--- a/src/test/java/com/yahoo/sketches/hll/HllSketchTest.java
+++ b/src/test/java/com/yahoo/sketches/hll/HllSketchTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/test/java/com/yahoo/sketches/hll/PreambleUtilTest.java b/src/test/java/com/yahoo/sketches/hll/PreambleUtilTest.java
index 29185e4..875d5df 100644
--- a/src/test/java/com/yahoo/sketches/hll/PreambleUtilTest.java
+++ b/src/test/java/com/yahoo/sketches/hll/PreambleUtilTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/test/java/com/yahoo/sketches/hll/TablesTest.java b/src/test/java/com/yahoo/sketches/hll/TablesTest.java
index 2203abb..e137dd9 100644
--- a/src/test/java/com/yahoo/sketches/hll/TablesTest.java
+++ b/src/test/java/com/yahoo/sketches/hll/TablesTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/test/java/com/yahoo/sketches/hll/ToFromByteArrayTest.java b/src/test/java/com/yahoo/sketches/hll/ToFromByteArrayTest.java
index 37b7818..0b5fa0b 100644
--- a/src/test/java/com/yahoo/sketches/hll/ToFromByteArrayTest.java
+++ b/src/test/java/com/yahoo/sketches/hll/ToFromByteArrayTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/test/java/com/yahoo/sketches/hll/UnionCaseTest.java b/src/test/java/com/yahoo/sketches/hll/UnionCaseTest.java
index e78f6bd..b86bac0 100644
--- a/src/test/java/com/yahoo/sketches/hll/UnionCaseTest.java
+++ b/src/test/java/com/yahoo/sketches/hll/UnionCaseTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/test/java/com/yahoo/sketches/hll/UnionTest.java b/src/test/java/com/yahoo/sketches/hll/UnionTest.java
index f814c62..bd83f12 100644
--- a/src/test/java/com/yahoo/sketches/hll/UnionTest.java
+++ b/src/test/java/com/yahoo/sketches/hll/UnionTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hll;
diff --git a/src/test/java/com/yahoo/sketches/hllmap/CouponHashMapTest.java b/src/test/java/com/yahoo/sketches/hllmap/CouponHashMapTest.java
index 7a2d718..4c60e59 100644
--- a/src/test/java/com/yahoo/sketches/hllmap/CouponHashMapTest.java
+++ b/src/test/java/com/yahoo/sketches/hllmap/CouponHashMapTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hllmap;
diff --git a/src/test/java/com/yahoo/sketches/hllmap/CouponTraverseMapTest.java b/src/test/java/com/yahoo/sketches/hllmap/CouponTraverseMapTest.java
index f556fc0..ad13e19 100644
--- a/src/test/java/com/yahoo/sketches/hllmap/CouponTraverseMapTest.java
+++ b/src/test/java/com/yahoo/sketches/hllmap/CouponTraverseMapTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hllmap;
diff --git a/src/test/java/com/yahoo/sketches/hllmap/HllMapTest.java b/src/test/java/com/yahoo/sketches/hllmap/HllMapTest.java
index 93e92bd..c3f499c 100644
--- a/src/test/java/com/yahoo/sketches/hllmap/HllMapTest.java
+++ b/src/test/java/com/yahoo/sketches/hllmap/HllMapTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hllmap;
diff --git a/src/test/java/com/yahoo/sketches/hllmap/SingleCouponMapTest.java b/src/test/java/com/yahoo/sketches/hllmap/SingleCouponMapTest.java
index 5a59d14..6ae5241 100644
--- a/src/test/java/com/yahoo/sketches/hllmap/SingleCouponMapTest.java
+++ b/src/test/java/com/yahoo/sketches/hllmap/SingleCouponMapTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hllmap;
diff --git a/src/test/java/com/yahoo/sketches/hllmap/UniqueCountMapTest.java b/src/test/java/com/yahoo/sketches/hllmap/UniqueCountMapTest.java
index 079834c..7a73ea9 100644
--- a/src/test/java/com/yahoo/sketches/hllmap/UniqueCountMapTest.java
+++ b/src/test/java/com/yahoo/sketches/hllmap/UniqueCountMapTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.hllmap;
diff --git a/src/test/java/com/yahoo/sketches/kll/DeprecatedAndMiscTest.java b/src/test/java/com/yahoo/sketches/kll/DeprecatedAndMiscTest.java
index 9e47191..38e72d8 100644
--- a/src/test/java/com/yahoo/sketches/kll/DeprecatedAndMiscTest.java
+++ b/src/test/java/com/yahoo/sketches/kll/DeprecatedAndMiscTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.kll;
diff --git a/src/test/java/com/yahoo/sketches/kll/KllFloatsSketchIteratorTest.java b/src/test/java/com/yahoo/sketches/kll/KllFloatsSketchIteratorTest.java
index 8a761f8..4a97fb3 100644
--- a/src/test/java/com/yahoo/sketches/kll/KllFloatsSketchIteratorTest.java
+++ b/src/test/java/com/yahoo/sketches/kll/KllFloatsSketchIteratorTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.kll;
diff --git a/src/test/java/com/yahoo/sketches/kll/KllFloatsSketchTest.java b/src/test/java/com/yahoo/sketches/kll/KllFloatsSketchTest.java
index 18cf4f5..246d10a 100644
--- a/src/test/java/com/yahoo/sketches/kll/KllFloatsSketchTest.java
+++ b/src/test/java/com/yahoo/sketches/kll/KllFloatsSketchTest.java
@@ -1,3 +1,22 @@
+/*
+ * 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 com.yahoo.sketches.kll;
 
 import static org.testng.Assert.assertEquals;
diff --git a/src/test/java/com/yahoo/sketches/kll/KllValidationTest.java b/src/test/java/com/yahoo/sketches/kll/KllValidationTest.java
index 6647ae6..364d37a 100644
--- a/src/test/java/com/yahoo/sketches/kll/KllValidationTest.java
+++ b/src/test/java/com/yahoo/sketches/kll/KllValidationTest.java
@@ -1,3 +1,22 @@
+/*
+ * 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 com.yahoo.sketches.kll;
 
 import org.testng.Assert;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/AccuracyTest.java b/src/test/java/com/yahoo/sketches/quantiles/AccuracyTest.java
index ae84cf9..c5fb2e3 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/AccuracyTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/AccuracyTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/DebugUnionTest.java b/src/test/java/com/yahoo/sketches/quantiles/DebugUnionTest.java
index 88d3d7d..f161939 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/DebugUnionTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/DebugUnionTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2019, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/DeprecatedAndMiscTest.java b/src/test/java/com/yahoo/sketches/quantiles/DeprecatedAndMiscTest.java
index baf486d..387a9ad 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/DeprecatedAndMiscTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/DeprecatedAndMiscTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/DirectCompactDoublesSketchTest.java b/src/test/java/com/yahoo/sketches/quantiles/DirectCompactDoublesSketchTest.java
index 6db1c8a..1c74352 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/DirectCompactDoublesSketchTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/DirectCompactDoublesSketchTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/DirectQuantilesMemoryRequestTest.java b/src/test/java/com/yahoo/sketches/quantiles/DirectQuantilesMemoryRequestTest.java
index 2bf1c9f..2eb73bf 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/DirectQuantilesMemoryRequestTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/DirectQuantilesMemoryRequestTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/DirectUpdateDoublesSketchTest.java b/src/test/java/com/yahoo/sketches/quantiles/DirectUpdateDoublesSketchTest.java
index e45b9e0..c593ce7 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/DirectUpdateDoublesSketchTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/DirectUpdateDoublesSketchTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/DoublesSketchBuilderTest.java b/src/test/java/com/yahoo/sketches/quantiles/DoublesSketchBuilderTest.java
index 20ab167..fd3b8c1 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/DoublesSketchBuilderTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/DoublesSketchBuilderTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/DoublesSketchIteratorTest.java b/src/test/java/com/yahoo/sketches/quantiles/DoublesSketchIteratorTest.java
index 282490d..78e3abf 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/DoublesSketchIteratorTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/DoublesSketchIteratorTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/DoublesSketchTest.java b/src/test/java/com/yahoo/sketches/quantiles/DoublesSketchTest.java
index ede03ca..2a2be04 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/DoublesSketchTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/DoublesSketchTest.java
@@ -1,3 +1,22 @@
+/*
+ * 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 com.yahoo.sketches.quantiles;
 
 import static org.testng.Assert.assertEquals;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/DoublesUnionBuilderTest.java b/src/test/java/com/yahoo/sketches/quantiles/DoublesUnionBuilderTest.java
index 941311c..efc2172 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/DoublesUnionBuilderTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/DoublesUnionBuilderTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/DoublesUnionImplTest.java b/src/test/java/com/yahoo/sketches/quantiles/DoublesUnionImplTest.java
index c68fe0e..7ce2ffa 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/DoublesUnionImplTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/DoublesUnionImplTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/DoublesUtilTest.java b/src/test/java/com/yahoo/sketches/quantiles/DoublesUtilTest.java
index f749b47..bf31279 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/DoublesUtilTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/DoublesUtilTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/ForwardCompatibilityTest.java b/src/test/java/com/yahoo/sketches/quantiles/ForwardCompatibilityTest.java
index 8a5b9a6..b8e1f52 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/ForwardCompatibilityTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/ForwardCompatibilityTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/HeapCompactDoublesSketchTest.java b/src/test/java/com/yahoo/sketches/quantiles/HeapCompactDoublesSketchTest.java
index 99c1cf1..313eea2 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/HeapCompactDoublesSketchTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/HeapCompactDoublesSketchTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/HeapUpdateDoublesSketchTest.java b/src/test/java/com/yahoo/sketches/quantiles/HeapUpdateDoublesSketchTest.java
index edca5e6..cf86683 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/HeapUpdateDoublesSketchTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/HeapUpdateDoublesSketchTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/ItemsSketchIteratorTest.java b/src/test/java/com/yahoo/sketches/quantiles/ItemsSketchIteratorTest.java
index f1255c9..b8e2a31 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/ItemsSketchIteratorTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/ItemsSketchIteratorTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/ItemsSketchTest.java b/src/test/java/com/yahoo/sketches/quantiles/ItemsSketchTest.java
index c673050..b1cd600 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/ItemsSketchTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/ItemsSketchTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/ItemsUnionTest.java b/src/test/java/com/yahoo/sketches/quantiles/ItemsUnionTest.java
index 9cc5996..065ea6d 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/ItemsUnionTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/ItemsUnionTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2016, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/PreambleUtilTest.java b/src/test/java/com/yahoo/sketches/quantiles/PreambleUtilTest.java
index b587527..293af89 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/PreambleUtilTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/PreambleUtilTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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 com.yahoo.sketches.quantiles;
diff --git a/src/test/java/com/yahoo/sketches/quantiles/ReadOnlyMemoryTest.java b/src/test/java/com/yahoo/sketches/quantiles/ReadOnlyMemoryTest.java
index 2785837..be0a8f0 100644
--- a/src/test/java/com/yahoo/sketches/quantiles/ReadOnlyMemoryTest.java
+++ b/src/test/java/com/yahoo/sketches/quantiles/ReadOnlyMemoryTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * 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
... 1528 lines suppressed ...


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org