From b2891233ad174d0c2e744736980aaaaebd1055f9 Mon Sep 17 00:00:00 2001
From: Stephane Del Pino <stephane.delpino44@gmail.com>
Date: Wed, 12 Feb 2020 20:53:24 +0100
Subject: [PATCH] git subrepo pull (merge) packages/kokkos
subrepo:
subdir: "packages/kokkos"
merged: "586d07ba0"
upstream:
origin: "git@github.com:kokkos/kokkos.git"
branch: "master"
commit: "586d07ba0"
git-subrepo:
version: "0.4.1"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "a04d8c2"
---
packages/kokkos/.gitrepo | 4 +-
packages/kokkos/Copyright.txt | 7 +-
packages/kokkos/LICENSE | 7 +-
.../kokkos/algorithms/src/Kokkos_Random.hpp | 7 +-
.../kokkos/algorithms/src/Kokkos_Sort.hpp | 7 +-
.../kokkos/algorithms/unit_tests/TestCuda.cpp | 7 +-
.../kokkos/algorithms/unit_tests/TestHPX.cpp | 7 +-
.../algorithms/unit_tests/TestOpenMP.cpp | 7 +-
.../kokkos/algorithms/unit_tests/TestROCm.cpp | 7 +-
.../algorithms/unit_tests/TestRandom.hpp | 7 +-
.../algorithms/unit_tests/TestSerial.cpp | 7 +-
.../kokkos/algorithms/unit_tests/TestSort.hpp | 7 +-
.../algorithms/unit_tests/TestThreads.cpp | 7 +-
.../algorithms/unit_tests/UnitTestMain.cpp | 7 +-
.../benchmarks/bytes_and_flops/bench.hpp | 7 +-
.../bytes_and_flops/bench_stride.hpp | 7 +-
.../bytes_and_flops/bench_unroll_stride.hpp | 7 +-
.../benchmarks/bytes_and_flops/main.cpp | 7 +-
packages/kokkos/benchmarks/gather/gather.hpp | 7 +-
.../benchmarks/gather/gather_unroll.hpp | 7 +-
packages/kokkos/benchmarks/gather/main.cpp | 7 +-
.../kokkos/benchmarks/gups/gups-kokkos.cc | 7 +-
.../benchmarks/policy_performance/main.cpp | 7 +-
.../policy_performance/policy_perf_test.hpp | 7 +-
.../kokkos/benchmarks/stream/stream-kokkos.cc | 7 +-
.../containers/performance_tests/TestCuda.cpp | 7 +-
.../performance_tests/TestDynRankView.hpp | 7 +-
.../performance_tests/TestGlobal2LocalIds.hpp | 7 +-
.../containers/performance_tests/TestHPX.cpp | 7 +-
.../containers/performance_tests/TestMain.cpp | 7 +-
.../performance_tests/TestOpenMP.cpp | 7 +-
.../containers/performance_tests/TestROCm.cpp | 7 +-
.../performance_tests/TestScatterView.hpp | 7 +-
.../performance_tests/TestThreads.cpp | 7 +-
.../TestUnorderedMapPerformance.hpp | 7 +-
.../kokkos/containers/src/Kokkos_Bitset.hpp | 7 +-
.../kokkos/containers/src/Kokkos_DualView.hpp | 7 +-
.../containers/src/Kokkos_DynRankView.hpp | 7 +-
.../containers/src/Kokkos_DynamicView.hpp | 7 +-
.../containers/src/Kokkos_ErrorReporter.hpp | 7 +-
.../containers/src/Kokkos_Functional.hpp | 7 +-
.../containers/src/Kokkos_ScatterView.hpp | 7 +-
.../containers/src/Kokkos_StaticCrsGraph.hpp | 7 +-
.../containers/src/Kokkos_UnorderedMap.hpp | 7 +-
.../kokkos/containers/src/Kokkos_Vector.hpp | 7 +-
.../src/impl/Kokkos_Bitset_impl.hpp | 7 +-
.../src/impl/Kokkos_Functional_impl.hpp | 7 +-
.../impl/Kokkos_StaticCrsGraph_factory.hpp | 7 +-
.../src/impl/Kokkos_UnorderedMap_impl.cpp | 7 +-
.../src/impl/Kokkos_UnorderedMap_impl.hpp | 7 +-
.../containers/unit_tests/TestBitset.hpp | 7 +-
.../containers/unit_tests/TestDualView.hpp | 7 +-
.../containers/unit_tests/TestDynViewAPI.hpp | 7 +-
.../unit_tests/TestDynViewAPI_generic.hpp | 7 +-
.../unit_tests/TestDynViewAPI_rank12345.hpp | 7 +-
.../unit_tests/TestDynViewAPI_rank67.hpp | 7 +-
.../containers/unit_tests/TestDynamicView.hpp | 7 +-
.../unit_tests/TestErrorReporter.hpp | 7 +-
.../containers/unit_tests/TestOffsetView.hpp | 7 +-
.../containers/unit_tests/TestScatterView.hpp | 7 +-
.../unit_tests/TestStaticCrsGraph.hpp | 7 +-
.../unit_tests/TestUnorderedMap.hpp | 7 +-
.../containers/unit_tests/TestVector.hpp | 7 +-
.../TestViewCtorPropEmbeddedDim.hpp | 7 +-
.../containers/unit_tests/UnitTestMain.cpp | 7 +-
.../unit_tests/cuda/TestCuda_BitSet.cpp | 7 +-
.../unit_tests/cuda/TestCuda_Category.hpp | 7 +-
.../unit_tests/cuda/TestCuda_DualView.cpp | 7 +-
.../cuda/TestCuda_DynRankViewAPI_generic.cpp | 7 +-
.../TestCuda_DynRankViewAPI_rank12345.cpp | 7 +-
.../cuda/TestCuda_DynRankViewAPI_rank67.cpp | 7 +-
.../unit_tests/cuda/TestCuda_DynamicView.cpp | 7 +-
.../cuda/TestCuda_ErrorReporter.cpp | 7 +-
.../unit_tests/cuda/TestCuda_OffsetView.cpp | 7 +-
.../unit_tests/cuda/TestCuda_ScatterView.cpp | 7 +-
.../cuda/TestCuda_StaticCrsGraph.cpp | 7 +-
.../unit_tests/cuda/TestCuda_UnorderedMap.cpp | 7 +-
.../unit_tests/cuda/TestCuda_Vector.cpp | 7 +-
.../cuda/TestCuda_ViewCtorPropEmbeddedDim.cpp | 7 +-
.../unit_tests/hpx/TestHPX_BitSet.cpp | 7 +-
.../unit_tests/hpx/TestHPX_Category.hpp | 7 +-
.../unit_tests/hpx/TestHPX_DualView.cpp | 7 +-
.../hpx/TestHPX_DynRankViewAPI_generic.cpp | 7 +-
.../hpx/TestHPX_DynRankViewAPI_rank12345.cpp | 7 +-
.../hpx/TestHPX_DynRankViewAPI_rank67.cpp | 7 +-
.../unit_tests/hpx/TestHPX_DynamicView.cpp | 7 +-
.../unit_tests/hpx/TestHPX_ErrorReporter.cpp | 7 +-
.../unit_tests/hpx/TestHPX_OffsetView.cpp | 7 +-
.../unit_tests/hpx/TestHPX_ScatterView.cpp | 7 +-
.../unit_tests/hpx/TestHPX_StaticCrsGraph.cpp | 7 +-
.../unit_tests/hpx/TestHPX_UnorderedMap.cpp | 7 +-
.../unit_tests/hpx/TestHPX_Vector.cpp | 7 +-
.../hpx/TestHPX_ViewCtorPropEmbeddedDim.cpp | 7 +-
.../unit_tests/openmp/TestOpenMP_BitSet.cpp | 7 +-
.../unit_tests/openmp/TestOpenMP_Category.hpp | 7 +-
.../unit_tests/openmp/TestOpenMP_DualView.cpp | 7 +-
.../TestOpenMP_DynRankViewAPI_generic.cpp | 7 +-
.../TestOpenMP_DynRankViewAPI_rank12345.cpp | 7 +-
.../TestOpenMP_DynRankViewAPI_rank67.cpp | 7 +-
.../openmp/TestOpenMP_DynamicView.cpp | 7 +-
.../openmp/TestOpenMP_ErrorReporter.cpp | 7 +-
.../openmp/TestOpenMP_OffsetView.cpp | 7 +-
.../openmp/TestOpenMP_ScatterView.cpp | 7 +-
.../openmp/TestOpenMP_StaticCrsGraph.cpp | 7 +-
.../openmp/TestOpenMP_UnorderedMap.cpp | 7 +-
.../unit_tests/openmp/TestOpenMP_Vector.cpp | 7 +-
.../TestOpenMP_ViewCtorPropEmbeddedDim.cpp | 7 +-
.../unit_tests/rocm/TestROCm_BitSet.cpp | 7 +-
.../unit_tests/rocm/TestROCm_Category.hpp | 7 +-
.../unit_tests/rocm/TestROCm_DualView.cpp | 7 +-
.../rocm/TestROCm_DynRankViewAPI_generic.cpp | 7 +-
.../TestROCm_DynRankViewAPI_rank12345.cpp | 7 +-
.../rocm/TestROCm_DynRankViewAPI_rank67.cpp | 7 +-
.../unit_tests/rocm/TestROCm_DynamicView.cpp | 7 +-
.../rocm/TestROCm_ErrorReporter.cpp | 7 +-
.../unit_tests/rocm/TestROCm_ScatterView.cpp | 7 +-
.../rocm/TestROCm_StaticCrsGraph.cpp | 7 +-
.../unit_tests/rocm/TestROCm_UnorderedMap.cpp | 7 +-
.../unit_tests/rocm/TestROCm_Vector.cpp | 7 +-
.../rocm/TestROCm_ViewCtorPropEmbeddedDim.cpp | 7 +-
.../unit_tests/serial/TestSerial_BitSet.cpp | 7 +-
.../unit_tests/serial/TestSerial_Category.hpp | 7 +-
.../unit_tests/serial/TestSerial_DualView.cpp | 7 +-
.../TestSerial_DynRankViewAPI_generic.cpp | 7 +-
.../TestSerial_DynRankViewAPI_rank12345.cpp | 7 +-
.../TestSerial_DynRankViewAPI_rank67.cpp | 7 +-
.../serial/TestSerial_DynamicView.cpp | 7 +-
.../serial/TestSerial_ErrorReporter.cpp | 7 +-
.../serial/TestSerial_OffsetView.cpp | 7 +-
.../serial/TestSerial_ScatterView.cpp | 7 +-
.../serial/TestSerial_StaticCrsGraph.cpp | 7 +-
.../serial/TestSerial_UnorderedMap.cpp | 7 +-
.../unit_tests/serial/TestSerial_Vector.cpp | 7 +-
.../TestSerial_ViewCtorPropEmbeddedDim.cpp | 7 +-
.../unit_tests/threads/TestThreads_BitSet.cpp | 7 +-
.../threads/TestThreads_Category.hpp | 7 +-
.../threads/TestThreads_DualView.cpp | 7 +-
.../TestThreads_DynRankViewAPI_generic.cpp | 7 +-
.../TestThreads_DynRankViewAPI_rank12345.cpp | 7 +-
.../TestThreads_DynRankViewAPI_rank67.cpp | 7 +-
.../threads/TestThreads_DynamicView.cpp | 7 +-
.../threads/TestThreads_ErrorReporter.cpp | 7 +-
.../threads/TestThreads_OffsetView.cpp | 7 +-
.../threads/TestThreads_ScatterView.cpp | 7 +-
.../threads/TestThreads_StaticCrsGraph.cpp | 7 +-
.../threads/TestThreads_UnorderedMap.cpp | 7 +-
.../unit_tests/threads/TestThreads_Vector.cpp | 7 +-
.../TestThreads_ViewCtorPropEmbeddedDim.cpp | 7 +-
.../core/perf_test/PerfTestBlasKernels.hpp | 7 +-
.../kokkos/core/perf_test/PerfTestDriver.hpp | 7 +-
.../core/perf_test/PerfTestGramSchmidt.cpp | 7 +-
.../kokkos/core/perf_test/PerfTestHexGrad.cpp | 7 +-
.../kokkos/core/perf_test/PerfTestMDRange.hpp | 7 +-
.../kokkos/core/perf_test/PerfTestMain.cpp | 7 +-
.../core/perf_test/PerfTest_Category.hpp | 7 +-
.../perf_test/PerfTest_CustomReduction.cpp | 7 +-
.../core/perf_test/PerfTest_ViewAllocate.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy.hpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_a123.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_a45.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_a6.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_a7.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_a8.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_b123.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_b45.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_b6.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_b7.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_b8.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_c123.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_c45.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_c6.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_c7.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_c8.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_d123.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_d45.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_d6.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_d7.cpp | 7 +-
.../core/perf_test/PerfTest_ViewCopy_d8.cpp | 7 +-
.../core/perf_test/PerfTest_ViewFill.hpp | 7 +-
.../core/perf_test/PerfTest_ViewFill_123.cpp | 7 +-
.../core/perf_test/PerfTest_ViewFill_45.cpp | 7 +-
.../core/perf_test/PerfTest_ViewFill_6.cpp | 7 +-
.../core/perf_test/PerfTest_ViewFill_7.cpp | 7 +-
.../core/perf_test/PerfTest_ViewFill_8.cpp | 7 +-
.../core/perf_test/PerfTest_ViewResize.hpp | 7 +-
.../perf_test/PerfTest_ViewResize_123.cpp | 7 +-
.../core/perf_test/PerfTest_ViewResize_45.cpp | 7 +-
.../core/perf_test/PerfTest_ViewResize_6.cpp | 7 +-
.../core/perf_test/PerfTest_ViewResize_7.cpp | 7 +-
.../core/perf_test/PerfTest_ViewResize_8.cpp | 7 +-
.../kokkos/core/perf_test/test_atomic.cpp | 7 +-
.../kokkos/core/perf_test/test_mempool.cpp | 7 +-
.../kokkos/core/perf_test/test_taskdag.cpp | 7 +-
.../src/Cuda/KokkosExp_Cuda_IterateTile.hpp | 7 +-
.../KokkosExp_Cuda_IterateTile_Refactor.hpp | 7 +-
.../kokkos/core/src/Cuda/Kokkos_CudaSpace.cpp | 7 +-
.../core/src/Cuda/Kokkos_Cuda_Alloc.hpp | 7 +-
.../Cuda/Kokkos_Cuda_Atomic_Intrinsics.hpp | 4 +-
...uda_Atomic_Intrinsics_Restore_Builtins.hpp | 4 +-
.../Cuda/Kokkos_Cuda_BlockSize_Deduction.hpp | 7 +-
.../core/src/Cuda/Kokkos_Cuda_Error.hpp | 7 +-
.../core/src/Cuda/Kokkos_Cuda_Instance.cpp | 7 +-
.../src/Cuda/Kokkos_Cuda_KernelLaunch.hpp | 7 +-
.../core/src/Cuda/Kokkos_Cuda_Locks.cpp | 7 +-
.../core/src/Cuda/Kokkos_Cuda_Locks.hpp | 7 +-
.../core/src/Cuda/Kokkos_Cuda_Parallel.hpp | 7 +-
.../core/src/Cuda/Kokkos_Cuda_ReduceScan.hpp | 7 +-
.../kokkos/core/src/Cuda/Kokkos_Cuda_Task.cpp | 7 +-
.../kokkos/core/src/Cuda/Kokkos_Cuda_Task.hpp | 7 +-
.../kokkos/core/src/Cuda/Kokkos_Cuda_Team.hpp | 7 +-
.../core/src/Cuda/Kokkos_Cuda_UniqueToken.hpp | 7 +-
.../src/Cuda/Kokkos_Cuda_Vectorization.hpp | 7 +-
.../kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp | 7 +-
.../src/Cuda/Kokkos_Cuda_ViewCopyETIAvail.hpp | 7 +-
.../src/Cuda/Kokkos_Cuda_ViewCopyETIDecl.hpp | 7 +-
.../src/Cuda/Kokkos_Cuda_WorkGraphPolicy.hpp | 7 +-
.../core/src/Cuda/Kokkos_Cuda_abort.hpp | 7 +-
packages/kokkos/core/src/HPX/Kokkos_HPX.cpp | 7 +-
.../Kokkos_HPX_ChunkedRoundRobinExecutor.hpp | 7 +-
.../kokkos/core/src/HPX/Kokkos_HPX_Task.cpp | 7 +-
.../kokkos/core/src/HPX/Kokkos_HPX_Task.hpp | 7 +-
.../src/HPX/Kokkos_HPX_ViewCopyETIAvail.hpp | 7 +-
.../src/HPX/Kokkos_HPX_ViewCopyETIDecl.hpp | 7 +-
.../src/HPX/Kokkos_HPX_WorkGraphPolicy.hpp | 7 +-
.../core/src/KokkosExp_MDRangePolicy.hpp | 7 +-
.../kokkos/core/src/Kokkos_AnonymousSpace.hpp | 7 +-
packages/kokkos/core/src/Kokkos_Array.hpp | 7 +-
packages/kokkos/core/src/Kokkos_Atomic.hpp | 7 +-
packages/kokkos/core/src/Kokkos_Complex.hpp | 7 +-
packages/kokkos/core/src/Kokkos_Concepts.hpp | 7 +-
packages/kokkos/core/src/Kokkos_CopyViews.hpp | 7 +-
packages/kokkos/core/src/Kokkos_Core.hpp | 7 +-
packages/kokkos/core/src/Kokkos_Core_fwd.hpp | 7 +-
packages/kokkos/core/src/Kokkos_Crs.hpp | 7 +-
packages/kokkos/core/src/Kokkos_Cuda.hpp | 7 +-
packages/kokkos/core/src/Kokkos_CudaSpace.hpp | 7 +-
.../kokkos/core/src/Kokkos_ExecPolicy.hpp | 7 +-
packages/kokkos/core/src/Kokkos_Extents.hpp | 4 +-
packages/kokkos/core/src/Kokkos_Future.hpp | 7 +-
packages/kokkos/core/src/Kokkos_HBWSpace.hpp | 7 +-
packages/kokkos/core/src/Kokkos_HPX.hpp | 7 +-
packages/kokkos/core/src/Kokkos_HostSpace.hpp | 7 +-
packages/kokkos/core/src/Kokkos_Layout.hpp | 7 +-
packages/kokkos/core/src/Kokkos_Macros.hpp | 7 +-
.../kokkos/core/src/Kokkos_MasterLock.hpp | 7 +-
.../kokkos/core/src/Kokkos_MemoryPool.hpp | 7 +-
.../kokkos/core/src/Kokkos_MemoryTraits.hpp | 7 +-
.../kokkos/core/src/Kokkos_NumericTraits.hpp | 7 +-
packages/kokkos/core/src/Kokkos_OpenMP.hpp | 7 +-
.../kokkos/core/src/Kokkos_OpenMPTarget.hpp | 7 +-
.../core/src/Kokkos_OpenMPTargetSpace.hpp | 7 +-
packages/kokkos/core/src/Kokkos_Pair.hpp | 7 +-
packages/kokkos/core/src/Kokkos_Parallel.hpp | 7 +-
.../core/src/Kokkos_Parallel_Reduce.hpp | 7 +-
.../core/src/Kokkos_PointerOwnership.hpp | 7 +-
.../src/Kokkos_Profiling_ProfileSection.hpp | 85 ++++++++++---------
packages/kokkos/core/src/Kokkos_Qthreads.hpp | 7 +-
packages/kokkos/core/src/Kokkos_ROCm.hpp | 7 +-
packages/kokkos/core/src/Kokkos_ROCmSpace.hpp | 7 +-
.../kokkos/core/src/Kokkos_ScratchSpace.hpp | 7 +-
packages/kokkos/core/src/Kokkos_Serial.hpp | 7 +-
.../kokkos/core/src/Kokkos_TaskPolicy.hpp | 7 +-
.../kokkos/core/src/Kokkos_TaskScheduler.hpp | 7 +-
.../core/src/Kokkos_TaskScheduler_fwd.hpp | 7 +-
packages/kokkos/core/src/Kokkos_Threads.hpp | 7 +-
packages/kokkos/core/src/Kokkos_Timer.hpp | 7 +-
.../kokkos/core/src/Kokkos_UniqueToken.hpp | 7 +-
.../kokkos/core/src/Kokkos_Vectorization.hpp | 7 +-
packages/kokkos/core/src/Kokkos_View.hpp | 7 +-
.../core/src/Kokkos_WorkGraphPolicy.hpp | 7 +-
packages/kokkos/core/src/Kokkos_hwloc.hpp | 7 +-
.../core/src/OpenMP/Kokkos_OpenMP_Exec.cpp | 7 +-
.../core/src/OpenMP/Kokkos_OpenMP_Exec.hpp | 7 +-
.../src/OpenMP/Kokkos_OpenMP_Parallel.hpp | 7 +-
.../core/src/OpenMP/Kokkos_OpenMP_Task.cpp | 7 +-
.../core/src/OpenMP/Kokkos_OpenMP_Task.hpp | 7 +-
.../core/src/OpenMP/Kokkos_OpenMP_Team.hpp | 7 +-
.../OpenMP/Kokkos_OpenMP_ViewCopyETIAvail.hpp | 7 +-
.../OpenMP/Kokkos_OpenMP_ViewCopyETIDecl.hpp | 7 +-
.../OpenMP/Kokkos_OpenMP_WorkGraphPolicy.hpp | 7 +-
.../OpenMPTarget/Kokkos_OpenMPTargetSpace.cpp | 7 +-
.../OpenMPTarget/Kokkos_OpenMPTarget_Exec.cpp | 7 +-
.../OpenMPTarget/Kokkos_OpenMPTarget_Exec.hpp | 7 +-
.../Kokkos_OpenMPTarget_Parallel.hpp | 7 +-
.../OpenMPTarget/Kokkos_OpenMPTarget_Task.cpp | 7 +-
.../OpenMPTarget/Kokkos_OpenMPTarget_Task.hpp | 7 +-
.../core/src/Qthreads/Kokkos_QthreadsExec.cpp | 7 +-
.../core/src/Qthreads/Kokkos_QthreadsExec.hpp | 7 +-
.../src/Qthreads/Kokkos_Qthreads_Parallel.hpp | 7 +-
.../src/Qthreads/Kokkos_Qthreads_Task.cpp | 7 +-
.../src/Qthreads/Kokkos_Qthreads_Task.hpp | 7 +-
.../Qthreads/Kokkos_Qthreads_TaskQueue.hpp | 7 +-
.../Kokkos_Qthreads_TaskQueue_impl.hpp | 7 +-
.../KokkosExp_ROCm_IterateTile_Refactor.hpp | 7 +-
.../core/src/ROCm/Kokkos_ROCm_Atomic.hpp | 7 +-
.../core/src/ROCm/Kokkos_ROCm_Config.hpp | 7 +-
.../kokkos/core/src/ROCm/Kokkos_ROCm_Exec.cpp | 7 +-
.../kokkos/core/src/ROCm/Kokkos_ROCm_Exec.hpp | 7 +-
.../kokkos/core/src/ROCm/Kokkos_ROCm_Impl.cpp | 7 +-
.../core/src/ROCm/Kokkos_ROCm_Invoke.hpp | 7 +-
.../kokkos/core/src/ROCm/Kokkos_ROCm_Join.hpp | 7 +-
.../core/src/ROCm/Kokkos_ROCm_Parallel.hpp | 7 +-
.../core/src/ROCm/Kokkos_ROCm_Reduce.hpp | 7 +-
.../core/src/ROCm/Kokkos_ROCm_ReduceScan.hpp | 7 +-
.../kokkos/core/src/ROCm/Kokkos_ROCm_Scan.hpp | 7 +-
.../core/src/ROCm/Kokkos_ROCm_Space.cpp | 7 +-
.../kokkos/core/src/ROCm/Kokkos_ROCm_Task.cpp | 7 +-
.../kokkos/core/src/ROCm/Kokkos_ROCm_Task.hpp | 7 +-
.../kokkos/core/src/ROCm/Kokkos_ROCm_Tile.hpp | 7 +-
.../src/ROCm/Kokkos_ROCm_Vectorization.hpp | 7 +-
.../src/ROCm/Kokkos_ROCm_ViewCopyETIAvail.hpp | 7 +-
.../src/ROCm/Kokkos_ROCm_ViewCopyETIDecl.hpp | 7 +-
.../Serial/Kokkos_Serial_ViewCopyETIAvail.hpp | 7 +-
.../Serial/Kokkos_Serial_ViewCopyETIDecl.hpp | 7 +-
.../core/src/Threads/Kokkos_ThreadsExec.cpp | 7 +-
.../core/src/Threads/Kokkos_ThreadsExec.hpp | 7 +-
.../src/Threads/Kokkos_ThreadsExec_base.cpp | 7 +-
.../core/src/Threads/Kokkos_ThreadsTeam.hpp | 7 +-
.../src/Threads/Kokkos_Threads_Parallel.hpp | 7 +-
.../Kokkos_Threads_ViewCopyETIAvail.hpp | 7 +-
.../Kokkos_Threads_ViewCopyETIDecl.hpp | 7 +-
.../Kokkos_Threads_WorkGraphPolicy.hpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank1.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank2.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank3.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank4.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank5.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank8.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank1.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank2.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank3.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank4.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank5.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank8.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank1.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank2.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank3.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank4.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank5.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank8.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank1.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank2.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank3.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank4.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank5.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank8.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank1.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank2.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank3.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank4.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank5.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank8.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank1.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank2.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank3.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank4.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank5.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank8.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank1.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank2.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank3.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank4.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank5.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank8.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank1.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank2.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank3.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank4.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank5.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank8.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank1.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank2.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank3.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank4.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank5.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank8.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank1.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank2.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank3.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank4.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank5.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank8.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank1.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank2.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank3.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank4.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank5.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank8.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank1.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank2.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank3.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank4.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank5.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank8.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank1.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank2.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank3.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank4.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank5.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank8.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank1.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank2.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank3.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank4.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank5.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank8.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank1.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank2.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank3.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank4.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank5.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank8.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank1.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank2.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank3.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank4.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank5.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank8.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank1.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank2.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank3.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank4.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank5.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank8.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank1.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank2.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank3.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank4.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank5.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank8.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank1.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank2.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank3.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank4.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank5.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank8.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank1.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank2.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank3.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank4.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank5.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank8.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank1.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank2.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank3.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank4.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank5.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank8.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank1.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank2.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank3.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank4.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank5.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank8.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank1.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank2.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank3.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank4.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank5.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank8.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank1.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank2.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank3.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank4.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank5.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank8.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank1.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank2.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank3.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank4.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank5.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank8.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank1.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank2.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank3.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank4.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank5.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank8.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank1.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank2.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank3.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank4.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank5.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank8.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank1.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank2.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank3.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank4.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank5.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank8.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank1.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank2.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank3.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank4.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank5.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank8.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank1.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank2.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank3.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank4.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank5.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank8.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank1.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank2.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank3.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank4.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank5.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank8.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank1.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank2.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank3.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank4.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank5.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank8.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank1.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank2.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank3.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank4.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank5.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank8.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank1.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank2.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank3.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank4.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank5.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank8.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank1.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank2.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank3.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank4.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank5.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank8.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank1.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank2.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank3.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank4.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank5.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank8.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank1.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank2.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank3.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank4.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank5.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank8.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank1.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank2.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank3.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank4.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank5.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank8.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank1.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank2.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank3.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank4.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank5.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank8.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank1.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank2.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank3.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank4.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank5.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank8.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank1.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank2.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank3.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank4.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank5.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank8.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank1.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank2.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank3.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank4.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank5.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank8.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank1.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank2.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank3.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank4.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank5.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank8.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank1.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank2.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank3.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank4.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank5.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank8.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank1.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank2.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank3.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank4.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank5.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank8.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank1.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank2.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank3.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank4.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank5.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank8.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank1.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank2.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank3.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank4.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank5.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank8.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank1.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank2.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank3.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank4.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank5.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank8.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank1.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank2.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank3.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank4.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank5.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank8.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank1.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank2.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank3.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank4.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank5.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank8.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank1.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank2.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank3.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank4.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank5.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank8.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank1.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank2.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank3.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank4.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank5.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank8.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank1.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank2.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank3.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank4.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank5.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank8.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank1.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank2.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank3.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank4.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank5.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank8.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank1.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank2.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank3.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank4.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank5.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank8.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank1.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank2.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank3.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank4.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank5.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank8.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank1.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank2.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank3.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank4.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank5.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank8.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank1.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank2.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank3.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank4.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank5.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank8.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank1.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank2.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank3.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank4.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank5.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank8.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank1.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank2.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank3.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank4.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank5.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank8.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank1.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank2.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank3.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank4.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank5.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank8.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank1.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank2.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank3.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank4.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank5.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank8.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank1.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank2.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank3.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank4.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank5.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank8.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank1.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank2.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank3.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank4.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank5.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank8.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank1.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank2.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank3.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank4.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank5.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank8.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank1.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank2.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank3.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank4.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank5.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank8.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank1.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank2.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank3.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank4.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank5.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank8.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank1.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank2.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank3.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank4.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank5.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank8.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank1.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank2.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank3.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank4.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank5.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank8.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank1.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank2.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank3.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank4.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank5.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank8.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank1.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank2.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank3.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank4.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank5.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank8.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank1.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank2.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank3.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank4.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank5.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank8.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank1.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank2.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank3.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank4.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank5.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank8.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank1.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank2.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank3.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank4.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank5.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank8.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank1.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank2.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank3.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank4.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank5.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank8.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank1.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank2.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank3.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank4.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank5.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank8.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank1.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank2.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank3.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank4.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank5.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank8.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank1.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank2.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank3.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank4.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank5.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank8.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank1.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank2.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank3.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank4.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank5.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank8.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank1.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank2.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank3.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank4.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank5.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank8.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank1.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank2.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank3.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank4.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank5.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank8.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank1.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank2.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank3.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank4.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank5.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank8.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank1.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank2.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank3.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank4.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank5.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank8.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank1.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank2.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank3.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank4.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank5.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank8.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank1.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank2.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank3.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank4.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank5.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank8.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank1.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank2.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank3.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank4.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank5.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank8.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank1.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank2.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank3.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank4.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank5.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank8.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank1.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank2.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank3.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank4.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank5.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank8.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank1.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank2.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank3.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank4.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank5.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank8.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank1.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank2.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank3.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank4.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank5.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank8.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank1.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank2.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank3.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank4.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank5.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank8.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank1.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank2.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank3.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank4.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank5.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank8.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank1.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank2.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank3.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank4.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank5.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank8.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank1.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank2.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank3.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank4.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank5.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank8.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank1.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank2.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank3.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank4.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank5.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank8.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank1.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank2.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank3.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank4.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank5.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank8.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank1.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank2.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank3.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank4.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank5.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank8.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank1.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank2.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank3.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank4.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank5.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank8.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank1.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank2.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank3.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank4.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank5.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank8.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank1.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank2.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank3.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank4.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank5.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank8.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank1.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank2.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank3.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank4.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank5.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank8.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank1.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank2.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank3.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank4.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank5.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank8.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank1.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank2.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank3.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank4.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank5.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank8.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank1.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank2.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank3.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank4.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank5.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank8.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank1.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank2.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank3.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank4.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank5.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank8.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank1.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank2.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank3.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank4.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank5.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank8.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank1.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank2.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank3.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank4.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank5.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank8.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank1.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank2.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank3.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank4.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank5.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank8.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank1.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank2.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank3.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank4.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank5.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank8.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank1.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank2.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank3.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank4.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank5.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank8.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank1.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank2.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank3.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank4.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank5.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank8.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank1.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank2.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank3.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank4.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank5.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank8.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank1.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank2.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank3.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank4.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank5.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank8.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank1.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank2.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank3.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank4.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank5.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank8.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank1.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank2.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank3.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank4.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank5.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank8.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank1.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank2.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank3.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank4.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank5.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank8.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank1.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank2.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank3.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank4.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank5.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank8.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank1.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank2.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank3.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank4.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank5.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank8.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank1.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank2.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank3.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank4.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank5.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank8.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank1.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank2.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank3.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank4.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank5.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank8.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank1.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank2.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank3.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank4.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank5.cpp | 7 +-
...TIInst_int64_t_double_LayoutLeft_Rank8.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank1.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank2.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank3.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank4.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank5.cpp | 7 +-
...IInst_int64_t_double_LayoutRight_Rank8.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank1.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank2.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank3.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank4.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank5.cpp | 7 +-
...Inst_int64_t_double_LayoutStride_Rank8.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank1.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank2.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank3.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank4.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank5.cpp | 7 +-
...ETIInst_int64_t_float_LayoutLeft_Rank8.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank1.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank2.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank3.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank4.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank5.cpp | 7 +-
...TIInst_int64_t_float_LayoutRight_Rank8.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank1.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank2.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank3.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank4.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank5.cpp | 7 +-
...IInst_int64_t_float_LayoutStride_Rank8.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank1.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank2.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank3.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank4.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank5.cpp | 7 +-
...IInst_int64_t_int64_t_LayoutLeft_Rank8.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank1.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank2.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank3.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank4.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank5.cpp | 7 +-
...Inst_int64_t_int64_t_LayoutRight_Rank8.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank1.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank2.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank3.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank4.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank5.cpp | 7 +-
...nst_int64_t_int64_t_LayoutStride_Rank8.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank1.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank2.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank3.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank4.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank5.cpp | 7 +-
...pyETIInst_int64_t_int_LayoutLeft_Rank8.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank1.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank2.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank3.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank4.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank5.cpp | 7 +-
...yETIInst_int64_t_int_LayoutRight_Rank8.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank1.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank2.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank3.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank4.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank5.cpp | 7 +-
...ETIInst_int64_t_int_LayoutStride_Rank8.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank1.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank2.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank3.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank4.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank5.cpp | 7 +-
...opyETIInst_int_double_LayoutLeft_Rank8.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank1.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank2.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank3.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank4.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank5.cpp | 7 +-
...pyETIInst_int_double_LayoutRight_Rank8.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank1.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank2.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank3.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank4.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank5.cpp | 7 +-
...yETIInst_int_double_LayoutStride_Rank8.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank1.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank2.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank3.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank4.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank5.cpp | 7 +-
...CopyETIInst_int_float_LayoutLeft_Rank8.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank1.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank2.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank3.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank4.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank5.cpp | 7 +-
...opyETIInst_int_float_LayoutRight_Rank8.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank1.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank2.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank3.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank4.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank5.cpp | 7 +-
...pyETIInst_int_float_LayoutStride_Rank8.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank1.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank2.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank3.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank4.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank5.cpp | 7 +-
...pyETIInst_int_int64_t_LayoutLeft_Rank8.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank1.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank2.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank3.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank4.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank5.cpp | 7 +-
...yETIInst_int_int64_t_LayoutRight_Rank8.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank1.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank2.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank3.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank4.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank5.cpp | 7 +-
...ETIInst_int_int64_t_LayoutStride_Rank8.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank1.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank2.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank3.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank4.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank5.cpp | 7 +-
...ewCopyETIInst_int_int_LayoutLeft_Rank8.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank1.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank2.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank3.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank4.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank5.cpp | 7 +-
...wCopyETIInst_int_int_LayoutRight_Rank8.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank1.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank2.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank3.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank4.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank5.cpp | 7 +-
...CopyETIInst_int_int_LayoutStride_Rank8.cpp | 7 +-
.../src/impl/KokkosExp_Host_IterateTile.hpp | 7 +-
.../core/src/impl/KokkosExp_ViewMapping.hpp | 7 +-
.../core/src/impl/Kokkos_AnalyzePolicy.hpp | 7 +-
.../core/src/impl/Kokkos_Atomic_Assembly.hpp | 7 +-
.../Kokkos_Atomic_Compare_Exchange_Strong.hpp | 7 +-
.../Kokkos_Atomic_Compare_Exchange_Weak.hpp | 7 +-
.../core/src/impl/Kokkos_Atomic_Decrement.hpp | 7 +-
.../core/src/impl/Kokkos_Atomic_Exchange.hpp | 7 +-
.../core/src/impl/Kokkos_Atomic_Fetch_Add.hpp | 7 +-
.../core/src/impl/Kokkos_Atomic_Fetch_And.hpp | 7 +-
.../core/src/impl/Kokkos_Atomic_Fetch_Or.hpp | 7 +-
.../core/src/impl/Kokkos_Atomic_Fetch_Sub.hpp | 7 +-
.../core/src/impl/Kokkos_Atomic_Generic.hpp | 7 +-
.../core/src/impl/Kokkos_Atomic_Increment.hpp | 7 +-
.../core/src/impl/Kokkos_Atomic_Load.hpp | 4 +-
.../src/impl/Kokkos_Atomic_Memory_Order.hpp | 4 +-
.../core/src/impl/Kokkos_Atomic_Store.hpp | 4 +-
.../core/src/impl/Kokkos_Atomic_View.hpp | 7 +-
.../core/src/impl/Kokkos_Atomic_Windows.hpp | 7 +-
.../kokkos/core/src/impl/Kokkos_BitOps.hpp | 7 +-
.../core/src/impl/Kokkos_CPUDiscovery.cpp | 7 +-
.../core/src/impl/Kokkos_CPUDiscovery.hpp | 7 +-
.../kokkos/core/src/impl/Kokkos_ChaseLev.hpp | 7 +-
.../kokkos/core/src/impl/Kokkos_ClockTic.hpp | 7 +-
.../core/src/impl/Kokkos_ConcurrentBitset.hpp | 7 +-
packages/kokkos/core/src/impl/Kokkos_Core.cpp | 7 +-
packages/kokkos/core/src/impl/Kokkos_EBO.hpp | 7 +-
.../kokkos/core/src/impl/Kokkos_Error.cpp | 7 +-
.../kokkos/core/src/impl/Kokkos_Error.hpp | 7 +-
.../core/src/impl/Kokkos_ExecPolicy.cpp | 7 +-
.../src/impl/Kokkos_FixedBufferMemoryPool.hpp | 4 +-
.../core/src/impl/Kokkos_FunctorAdapter.hpp | 7 +-
.../core/src/impl/Kokkos_FunctorAnalysis.hpp | 7 +-
.../kokkos/core/src/impl/Kokkos_HBWSpace.cpp | 7 +-
.../core/src/impl/Kokkos_HostBarrier.cpp | 7 +-
.../core/src/impl/Kokkos_HostBarrier.hpp | 7 +-
.../kokkos/core/src/impl/Kokkos_HostSpace.cpp | 7 +-
.../src/impl/Kokkos_HostSpace_deepcopy.cpp | 7 +-
.../src/impl/Kokkos_HostSpace_deepcopy.hpp | 7 +-
.../core/src/impl/Kokkos_HostThreadTeam.cpp | 7 +-
.../core/src/impl/Kokkos_HostThreadTeam.hpp | 7 +-
packages/kokkos/core/src/impl/Kokkos_LIFO.hpp | 7 +-
.../core/src/impl/Kokkos_LinkedListNode.hpp | 7 +-
.../core/src/impl/Kokkos_MemoryPool.cpp | 7 +-
.../src/impl/Kokkos_MemoryPoolAllocator.hpp | 7 +-
.../core/src/impl/Kokkos_MemorySpace.hpp | 4 +-
.../core/src/impl/Kokkos_Memory_Fence.hpp | 7 +-
.../src/impl/Kokkos_MultipleTaskQueue.hpp | 7 +-
.../kokkos/core/src/impl/Kokkos_OldMacros.hpp | 7 +-
.../core/src/impl/Kokkos_OptionalRef.hpp | 7 +-
.../core/src/impl/Kokkos_PhysicalLayout.hpp | 7 +-
.../src/impl/Kokkos_Profiling_DeviceInfo.hpp | 81 +++++++++---------
.../src/impl/Kokkos_Profiling_Interface.cpp | 83 +++++++++---------
.../src/impl/Kokkos_Profiling_Interface.hpp | 83 +++++++++---------
.../kokkos/core/src/impl/Kokkos_Serial.cpp | 7 +-
.../core/src/impl/Kokkos_Serial_Task.cpp | 7 +-
.../core/src/impl/Kokkos_Serial_Task.hpp | 7 +-
.../impl/Kokkos_Serial_WorkGraphPolicy.hpp | 7 +-
.../core/src/impl/Kokkos_SharedAlloc.cpp | 7 +-
.../core/src/impl/Kokkos_SharedAlloc.hpp | 7 +-
.../src/impl/Kokkos_SimpleTaskScheduler.hpp | 7 +-
.../core/src/impl/Kokkos_SingleTaskQueue.hpp | 7 +-
.../kokkos/core/src/impl/Kokkos_Spinwait.cpp | 7 +-
.../kokkos/core/src/impl/Kokkos_Spinwait.hpp | 7 +-
packages/kokkos/core/src/impl/Kokkos_Tags.hpp | 7 +-
.../kokkos/core/src/impl/Kokkos_TaskBase.hpp | 7 +-
.../kokkos/core/src/impl/Kokkos_TaskNode.hpp | 7 +-
.../core/src/impl/Kokkos_TaskPolicyData.hpp | 7 +-
.../kokkos/core/src/impl/Kokkos_TaskQueue.hpp | 7 +-
.../core/src/impl/Kokkos_TaskQueueCommon.hpp | 7 +-
.../impl/Kokkos_TaskQueueMemoryManager.hpp | 7 +-
.../src/impl/Kokkos_TaskQueueMultiple.hpp | 7 +-
.../impl/Kokkos_TaskQueueMultiple_impl.hpp | 7 +-
.../core/src/impl/Kokkos_TaskQueue_impl.hpp | 7 +-
.../core/src/impl/Kokkos_TaskResult.hpp | 7 +-
.../core/src/impl/Kokkos_TaskTeamMember.hpp | 7 +-
.../kokkos/core/src/impl/Kokkos_Timer.hpp | 7 +-
.../kokkos/core/src/impl/Kokkos_Traits.hpp | 7 +-
.../kokkos/core/src/impl/Kokkos_Utilities.hpp | 7 +-
.../core/src/impl/Kokkos_VLAEmulation.hpp | 7 +-
.../kokkos/core/src/impl/Kokkos_ViewArray.hpp | 7 +-
.../kokkos/core/src/impl/Kokkos_ViewCtor.hpp | 7 +-
.../src/impl/Kokkos_ViewFillCopyETIAvail.hpp | 7 +-
.../src/impl/Kokkos_ViewFillCopyETIDecl.hpp | 7 +-
.../core/src/impl/Kokkos_ViewLayoutTiled.hpp | 7 +-
.../core/src/impl/Kokkos_ViewMapping.hpp | 7 +-
.../kokkos/core/src/impl/Kokkos_ViewTile.hpp | 7 +-
.../core/src/impl/Kokkos_ViewUniformType.hpp | 7 +-
.../core/src/impl/Kokkos_Volatile_Load.hpp | 7 +-
.../kokkos/core/src/impl/Kokkos_hwloc.cpp | 7 +-
packages/kokkos/core/src/kokkos.pc.in | 7 +-
.../kokkos/core/unit_test/TestAggregate.hpp | 7 +-
packages/kokkos/core/unit_test/TestAtomic.hpp | 7 +-
.../core/unit_test/TestAtomicOperations.hpp | 7 +-
.../TestAtomicOperations_complexdouble.hpp | 7 +-
.../TestAtomicOperations_complexfloat.hpp | 7 +-
.../unit_test/TestAtomicOperations_double.hpp | 7 +-
.../unit_test/TestAtomicOperations_float.hpp | 7 +-
.../unit_test/TestAtomicOperations_int.hpp | 7 +-
.../TestAtomicOperations_longint.hpp | 7 +-
.../TestAtomicOperations_longlongint.hpp | 7 +-
.../TestAtomicOperations_unsignedint.hpp | 7 +-
.../TestAtomicOperations_unsignedlongint.hpp | 7 +-
.../kokkos/core/unit_test/TestAtomicViews.hpp | 7 +-
packages/kokkos/core/unit_test/TestCXX11.hpp | 7 +-
.../core/unit_test/TestCXX11Deduction.hpp | 7 +-
.../core/unit_test/TestCompilerMacros.hpp | 7 +-
.../kokkos/core/unit_test/TestComplex.hpp | 7 +-
.../core/unit_test/TestConcurrentBitset.hpp | 7 +-
packages/kokkos/core/unit_test/TestCrs.hpp | 7 +-
.../unit_test/TestDefaultDeviceTypeInit.hpp | 7 +-
.../core/unit_test/TestFunctorAnalysis.hpp | 7 +-
packages/kokkos/core/unit_test/TestHWLOC.cpp | 7 +-
packages/kokkos/core/unit_test/TestInit.hpp | 7 +-
.../core/unit_test/TestLocalDeepCopy.hpp | 7 +-
.../kokkos/core/unit_test/TestMDRange.hpp | 7 +-
.../kokkos/core/unit_test/TestMDRange_a.hpp | 7 +-
.../kokkos/core/unit_test/TestMDRange_b.hpp | 7 +-
.../kokkos/core/unit_test/TestMDRange_c.hpp | 7 +-
.../kokkos/core/unit_test/TestMDRange_d.hpp | 7 +-
.../kokkos/core/unit_test/TestMDRange_e.hpp | 7 +-
.../kokkos/core/unit_test/TestMemoryPool.hpp | 7 +-
.../core/unit_test/TestPolicyConstruction.hpp | 7 +-
packages/kokkos/core/unit_test/TestRange.hpp | 7 +-
packages/kokkos/core/unit_test/TestReduce.hpp | 7 +-
.../unit_test/TestReduceCombinatorical.hpp | 7 +-
.../kokkos/core/unit_test/TestReducers.hpp | 7 +-
.../kokkos/core/unit_test/TestReducers_a.hpp | 7 +-
.../kokkos/core/unit_test/TestReducers_b.hpp | 7 +-
.../kokkos/core/unit_test/TestReducers_c.hpp | 7 +-
.../kokkos/core/unit_test/TestReducers_d.hpp | 7 +-
packages/kokkos/core/unit_test/TestResize.hpp | 7 +-
packages/kokkos/core/unit_test/TestScan.hpp | 7 +-
.../kokkos/core/unit_test/TestSharedAlloc.hpp | 7 +-
.../kokkos/core/unit_test/TestStackTrace.cpp | 7 +-
.../kokkos/core/unit_test/TestStackTrace.hpp | 7 +-
.../core/unit_test/TestStackTrace_f0.cpp | 7 +-
.../core/unit_test/TestStackTrace_f1.cpp | 7 +-
.../core/unit_test/TestStackTrace_f2.cpp | 7 +-
.../core/unit_test/TestStackTrace_f3.cpp | 7 +-
.../core/unit_test/TestStackTrace_f4.cpp | 7 +-
.../core/unit_test/TestTaskScheduler.hpp | 7 +-
.../unit_test/TestTaskScheduler_single.hpp | 7 +-
packages/kokkos/core/unit_test/TestTeam.hpp | 7 +-
.../core/unit_test/TestTeamTeamSize.hpp | 7 +-
.../kokkos/core/unit_test/TestTeamVector.hpp | 7 +-
.../core/unit_test/TestTeamVectorRange.hpp | 7 +-
.../unit_test/TestTemplateMetaFunctions.hpp | 7 +-
packages/kokkos/core/unit_test/TestTile.hpp | 7 +-
.../kokkos/core/unit_test/TestUniqueToken.hpp | 7 +-
.../kokkos/core/unit_test/TestUtilities.hpp | 7 +-
.../kokkos/core/unit_test/TestViewAPI.hpp | 7 +-
.../kokkos/core/unit_test/TestViewAPI_a.hpp | 7 +-
.../kokkos/core/unit_test/TestViewAPI_b.hpp | 7 +-
.../kokkos/core/unit_test/TestViewAPI_c.hpp | 7 +-
.../kokkos/core/unit_test/TestViewAPI_d.hpp | 7 +-
.../kokkos/core/unit_test/TestViewAPI_e.hpp | 7 +-
.../kokkos/core/unit_test/TestViewCopy.hpp | 7 +-
.../unit_test/TestViewCtorPropEmbeddedDim.hpp | 7 +-
.../TestViewLayoutStrideAssignment.hpp | 7 +-
.../core/unit_test/TestViewLayoutTiled.hpp | 7 +-
.../core/unit_test/TestViewMapping_a.hpp | 7 +-
.../core/unit_test/TestViewMapping_b.hpp | 7 +-
.../unit_test/TestViewMapping_subview.hpp | 7 +-
.../kokkos/core/unit_test/TestViewOfClass.hpp | 7 +-
.../kokkos/core/unit_test/TestViewResize.hpp | 7 +-
.../core/unit_test/TestViewSpaceAssign.hpp | 7 +-
.../kokkos/core/unit_test/TestViewSubview.hpp | 7 +-
.../kokkos/core/unit_test/TestView_64bit.hpp | 7 +-
.../kokkos/core/unit_test/TestWorkGraph.hpp | 7 +-
.../kokkos/core/unit_test/UnitTestMain.cpp | 7 +-
.../core/unit_test/UnitTestMainInit.cpp | 7 +-
.../unit_test/UnitTest_PushFinalizeHook.cpp | 7 +-
.../UnitTest_PushFinalizeHook_terminate.cpp | 7 +-
.../cuda/TestCudaHostPinned_Category.hpp | 7 +-
.../cuda/TestCudaHostPinned_SharedAlloc.cpp | 7 +-
.../cuda/TestCudaHostPinned_ViewAPI_a.cpp | 7 +-
.../cuda/TestCudaHostPinned_ViewAPI_b.cpp | 7 +-
.../cuda/TestCudaHostPinned_ViewAPI_c.cpp | 7 +-
.../cuda/TestCudaHostPinned_ViewAPI_d.cpp | 7 +-
.../cuda/TestCudaHostPinned_ViewAPI_e.cpp | 7 +-
.../cuda/TestCudaHostPinned_ViewCopy.cpp | 7 +-
.../cuda/TestCudaHostPinned_ViewMapping_a.cpp | 7 +-
.../cuda/TestCudaHostPinned_ViewMapping_b.cpp | 7 +-
...TestCudaHostPinned_ViewMapping_subview.cpp | 7 +-
.../unit_test/cuda/TestCudaUVM_Category.hpp | 7 +-
.../cuda/TestCudaUVM_SharedAlloc.cpp | 7 +-
.../unit_test/cuda/TestCudaUVM_ViewAPI_a.cpp | 7 +-
.../unit_test/cuda/TestCudaUVM_ViewAPI_b.cpp | 7 +-
.../unit_test/cuda/TestCudaUVM_ViewAPI_c.cpp | 7 +-
.../unit_test/cuda/TestCudaUVM_ViewAPI_d.cpp | 7 +-
.../unit_test/cuda/TestCudaUVM_ViewAPI_e.cpp | 7 +-
.../unit_test/cuda/TestCudaUVM_ViewCopy.cpp | 7 +-
.../cuda/TestCudaUVM_ViewMapping_a.cpp | 7 +-
.../cuda/TestCudaUVM_ViewMapping_b.cpp | 7 +-
.../cuda/TestCudaUVM_ViewMapping_subview.cpp | 7 +-
...estCuda_AtomicOperations_complexdouble.cpp | 7 +-
...TestCuda_AtomicOperations_complexfloat.cpp | 7 +-
.../cuda/TestCuda_AtomicOperations_double.cpp | 7 +-
.../cuda/TestCuda_AtomicOperations_float.cpp | 7 +-
.../cuda/TestCuda_AtomicOperations_int.cpp | 7 +-
.../TestCuda_AtomicOperations_longint.cpp | 7 +-
.../TestCuda_AtomicOperations_longlongint.cpp | 7 +-
.../TestCuda_AtomicOperations_unsignedint.cpp | 7 +-
...tCuda_AtomicOperations_unsignedlongint.cpp | 7 +-
.../unit_test/cuda/TestCuda_AtomicViews.cpp | 7 +-
.../core/unit_test/cuda/TestCuda_Atomics.cpp | 7 +-
.../core/unit_test/cuda/TestCuda_Category.hpp | 7 +-
.../core/unit_test/cuda/TestCuda_Complex.cpp | 7 +-
.../core/unit_test/cuda/TestCuda_Crs.cpp | 7 +-
.../cuda/TestCuda_DebugPinUVMSpace.cpp | 7 +-
.../cuda/TestCuda_DebugSerialExecution.cpp | 7 +-
.../cuda/TestCuda_DeepCopyAlignment.cpp | 7 +-
.../cuda/TestCuda_FunctorAnalysis.cpp | 7 +-
.../core/unit_test/cuda/TestCuda_Init.cpp | 7 +-
.../unit_test/cuda/TestCuda_InterOp_Init.cpp | 7 +-
.../cuda/TestCuda_InterOp_Streams.cpp | 7 +-
.../unit_test/cuda/TestCuda_LocalDeepCopy.cpp | 7 +-
.../unit_test/cuda/TestCuda_MDRange_a.cpp | 7 +-
.../unit_test/cuda/TestCuda_MDRange_b.cpp | 7 +-
.../unit_test/cuda/TestCuda_MDRange_c.cpp | 7 +-
.../unit_test/cuda/TestCuda_MDRange_d.cpp | 7 +-
.../unit_test/cuda/TestCuda_MDRange_e.cpp | 7 +-
.../core/unit_test/cuda/TestCuda_Other.cpp | 7 +-
.../unit_test/cuda/TestCuda_RangePolicy.cpp | 7 +-
.../unit_test/cuda/TestCuda_Reducers_a.cpp | 7 +-
.../unit_test/cuda/TestCuda_Reducers_b.cpp | 7 +-
.../unit_test/cuda/TestCuda_Reducers_c.cpp | 7 +-
.../unit_test/cuda/TestCuda_Reducers_d.cpp | 7 +-
.../unit_test/cuda/TestCuda_Reductions.cpp | 7 +-
.../cuda/TestCuda_Reductions_DeviceView.cpp | 7 +-
.../core/unit_test/cuda/TestCuda_Scan.cpp | 7 +-
.../unit_test/cuda/TestCuda_SharedAlloc.cpp | 7 +-
.../core/unit_test/cuda/TestCuda_Spaces.cpp | 7 +-
.../unit_test/cuda/TestCuda_SubView_a.cpp | 7 +-
.../unit_test/cuda/TestCuda_SubView_b.cpp | 7 +-
.../unit_test/cuda/TestCuda_SubView_c01.cpp | 7 +-
.../unit_test/cuda/TestCuda_SubView_c02.cpp | 7 +-
.../unit_test/cuda/TestCuda_SubView_c03.cpp | 7 +-
.../unit_test/cuda/TestCuda_SubView_c04.cpp | 7 +-
.../unit_test/cuda/TestCuda_SubView_c05.cpp | 7 +-
.../unit_test/cuda/TestCuda_SubView_c06.cpp | 7 +-
.../unit_test/cuda/TestCuda_SubView_c07.cpp | 7 +-
.../unit_test/cuda/TestCuda_SubView_c08.cpp | 7 +-
.../unit_test/cuda/TestCuda_SubView_c09.cpp | 7 +-
.../unit_test/cuda/TestCuda_SubView_c10.cpp | 7 +-
.../unit_test/cuda/TestCuda_SubView_c11.cpp | 7 +-
.../unit_test/cuda/TestCuda_SubView_c12.cpp | 7 +-
.../unit_test/cuda/TestCuda_SubView_c13.cpp | 7 +-
.../core/unit_test/cuda/TestCuda_Task.cpp | 7 +-
.../core/unit_test/cuda/TestCuda_Team.cpp | 7 +-
.../cuda/TestCuda_TeamReductionScan.cpp | 7 +-
.../unit_test/cuda/TestCuda_TeamScratch.cpp | 7 +-
.../unit_test/cuda/TestCuda_TeamTeamSize.cpp | 7 +-
.../cuda/TestCuda_TeamVectorRange.cpp | 7 +-
.../unit_test/cuda/TestCuda_UniqueToken.cpp | 7 +-
.../unit_test/cuda/TestCuda_ViewAPI_a.cpp | 7 +-
.../unit_test/cuda/TestCuda_ViewAPI_b.cpp | 7 +-
.../unit_test/cuda/TestCuda_ViewAPI_c.cpp | 7 +-
.../unit_test/cuda/TestCuda_ViewAPI_d.cpp | 7 +-
.../unit_test/cuda/TestCuda_ViewAPI_e.cpp | 7 +-
.../TestCuda_ViewLayoutStrideAssignment.cpp | 7 +-
.../unit_test/cuda/TestCuda_ViewMapping_a.cpp | 7 +-
.../unit_test/cuda/TestCuda_ViewMapping_b.cpp | 7 +-
.../cuda/TestCuda_ViewMapping_subview.cpp | 7 +-
.../unit_test/cuda/TestCuda_ViewOfClass.cpp | 7 +-
.../unit_test/cuda/TestCuda_ViewResize.cpp | 7 +-
.../unit_test/cuda/TestCuda_View_64bit.cpp | 7 +-
.../unit_test/cuda/TestCuda_WorkGraph.cpp | 7 +-
.../default/TestDefaultDeviceType.cpp | 7 +-
.../default/TestDefaultDeviceTypeResize.cpp | 7 +-
.../TestDefaultDeviceType_Category.hpp | 7 +-
.../default/TestDefaultDeviceType_a1.cpp | 7 +-
.../default/TestDefaultDeviceType_a2.cpp | 7 +-
.../default/TestDefaultDeviceType_a3.cpp | 7 +-
.../default/TestDefaultDeviceType_b1.cpp | 7 +-
.../default/TestDefaultDeviceType_b2.cpp | 7 +-
.../default/TestDefaultDeviceType_b3.cpp | 7 +-
.../default/TestDefaultDeviceType_c1.cpp | 7 +-
.../default/TestDefaultDeviceType_c2.cpp | 7 +-
.../default/TestDefaultDeviceType_c3.cpp | 7 +-
.../default/TestDefaultDeviceType_d.cpp | 7 +-
...TestHPX_AtomicOperations_complexdouble.cpp | 7 +-
.../TestHPX_AtomicOperations_complexfloat.cpp | 7 +-
.../hpx/TestHPX_AtomicOperations_double.cpp | 7 +-
.../hpx/TestHPX_AtomicOperations_float.cpp | 7 +-
.../hpx/TestHPX_AtomicOperations_int.cpp | 7 +-
.../hpx/TestHPX_AtomicOperations_longint.cpp | 7 +-
.../TestHPX_AtomicOperations_longlongint.cpp | 7 +-
.../TestHPX_AtomicOperations_unsignedint.cpp | 7 +-
...stHPX_AtomicOperations_unsignedlongint.cpp | 7 +-
.../unit_test/hpx/TestHPX_AtomicViews.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_Atomics.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_Category.hpp | 7 +-
.../core/unit_test/hpx/TestHPX_Complex.cpp | 7 +-
.../kokkos/core/unit_test/hpx/TestHPX_Crs.cpp | 7 +-
.../hpx/TestHPX_DeepCopyAlignment.cpp | 7 +-
.../unit_test/hpx/TestHPX_FunctorAnalysis.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_Init.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_InterOp.cpp | 7 +-
.../unit_test/hpx/TestHPX_LocalDeepCopy.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_MDRange_a.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_MDRange_b.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_MDRange_c.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_MDRange_d.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_MDRange_e.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_Other.cpp | 7 +-
.../unit_test/hpx/TestHPX_RangePolicy.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_Reducers_a.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_Reducers_b.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_Reducers_c.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_Reducers_d.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_Reductions.cpp | 7 +-
.../hpx/TestHPX_Reductions_DeviceView.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_Scan.cpp | 7 +-
.../unit_test/hpx/TestHPX_SharedAlloc.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_SubView_a.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_SubView_b.cpp | 7 +-
.../unit_test/hpx/TestHPX_SubView_c01.cpp | 7 +-
.../unit_test/hpx/TestHPX_SubView_c02.cpp | 7 +-
.../unit_test/hpx/TestHPX_SubView_c03.cpp | 7 +-
.../unit_test/hpx/TestHPX_SubView_c04.cpp | 7 +-
.../unit_test/hpx/TestHPX_SubView_c05.cpp | 7 +-
.../unit_test/hpx/TestHPX_SubView_c06.cpp | 7 +-
.../unit_test/hpx/TestHPX_SubView_c07.cpp | 7 +-
.../unit_test/hpx/TestHPX_SubView_c08.cpp | 7 +-
.../unit_test/hpx/TestHPX_SubView_c09.cpp | 7 +-
.../unit_test/hpx/TestHPX_SubView_c10.cpp | 7 +-
.../unit_test/hpx/TestHPX_SubView_c11.cpp | 7 +-
.../unit_test/hpx/TestHPX_SubView_c12.cpp | 7 +-
.../unit_test/hpx/TestHPX_SubView_c13.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_Task.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_Team.cpp | 7 +-
.../hpx/TestHPX_TeamReductionScan.cpp | 7 +-
.../unit_test/hpx/TestHPX_TeamScratch.cpp | 7 +-
.../unit_test/hpx/TestHPX_TeamTeamSize.cpp | 7 +-
.../unit_test/hpx/TestHPX_TeamVectorRange.cpp | 7 +-
.../unit_test/hpx/TestHPX_UniqueToken.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_ViewAPI_a.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_ViewAPI_b.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_ViewAPI_c.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_ViewAPI_d.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_ViewAPI_e.cpp | 7 +-
.../TestHPX_ViewLayoutStrideAssignment.cpp | 7 +-
.../unit_test/hpx/TestHPX_ViewMapping_a.cpp | 7 +-
.../unit_test/hpx/TestHPX_ViewMapping_b.cpp | 7 +-
.../hpx/TestHPX_ViewMapping_subview.cpp | 7 +-
.../unit_test/hpx/TestHPX_ViewOfClass.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_ViewResize.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_View_64bit.cpp | 7 +-
.../core/unit_test/hpx/TestHPX_WorkGraph.cpp | 7 +-
.../core/unit_test/openmp/TestOpenMP.hpp | 7 +-
...tOpenMP_AtomicOperations_complexdouble.cpp | 7 +-
...stOpenMP_AtomicOperations_complexfloat.cpp | 7 +-
.../TestOpenMP_AtomicOperations_double.cpp | 7 +-
.../TestOpenMP_AtomicOperations_float.cpp | 7 +-
.../TestOpenMP_AtomicOperations_int.cpp | 7 +-
.../TestOpenMP_AtomicOperations_longint.cpp | 7 +-
...estOpenMP_AtomicOperations_longlongint.cpp | 7 +-
...estOpenMP_AtomicOperations_unsignedint.cpp | 7 +-
...penMP_AtomicOperations_unsignedlongint.cpp | 7 +-
.../openmp/TestOpenMP_AtomicViews.cpp | 7 +-
.../unit_test/openmp/TestOpenMP_Atomics.cpp | 7 +-
.../unit_test/openmp/TestOpenMP_Category.hpp | 7 +-
.../unit_test/openmp/TestOpenMP_Complex.cpp | 7 +-
.../core/unit_test/openmp/TestOpenMP_Crs.cpp | 7 +-
.../openmp/TestOpenMP_DeepCopyAlignment.cpp | 7 +-
.../openmp/TestOpenMP_FunctorAnalysis.cpp | 7 +-
.../core/unit_test/openmp/TestOpenMP_Init.cpp | 7 +-
.../unit_test/openmp/TestOpenMP_InterOp.cpp | 7 +-
.../openmp/TestOpenMP_LocalDeepCopy.cpp | 7 +-
.../unit_test/openmp/TestOpenMP_MDRange_a.cpp | 7 +-
.../unit_test/openmp/TestOpenMP_MDRange_b.cpp | 7 +-
.../unit_test/openmp/TestOpenMP_MDRange_c.cpp | 7 +-
.../unit_test/openmp/TestOpenMP_MDRange_d.cpp | 7 +-
.../unit_test/openmp/TestOpenMP_MDRange_e.cpp | 7 +-
.../unit_test/openmp/TestOpenMP_Other.cpp | 7 +-
.../openmp/TestOpenMP_RangePolicy.cpp | 7 +-
.../openmp/TestOpenMP_Reducers_a.cpp | 7 +-
.../openmp/TestOpenMP_Reducers_b.cpp | 7 +-
.../openmp/TestOpenMP_Reducers_c.cpp | 7 +-
.../openmp/TestOpenMP_Reducers_d.cpp | 7 +-
.../openmp/TestOpenMP_Reductions.cpp | 7 +-
.../TestOpenMP_Reductions_DeviceView.cpp | 7 +-
.../core/unit_test/openmp/TestOpenMP_Scan.cpp | 7 +-
.../openmp/TestOpenMP_SharedAlloc.cpp | 7 +-
.../unit_test/openmp/TestOpenMP_SubView_a.cpp | 7 +-
.../unit_test/openmp/TestOpenMP_SubView_b.cpp | 7 +-
.../openmp/TestOpenMP_SubView_c01.cpp | 7 +-
.../openmp/TestOpenMP_SubView_c02.cpp | 7 +-
.../openmp/TestOpenMP_SubView_c03.cpp | 7 +-
.../openmp/TestOpenMP_SubView_c04.cpp | 7 +-
.../openmp/TestOpenMP_SubView_c05.cpp | 7 +-
.../openmp/TestOpenMP_SubView_c06.cpp | 7 +-
.../openmp/TestOpenMP_SubView_c07.cpp | 7 +-
.../openmp/TestOpenMP_SubView_c08.cpp | 7 +-
.../openmp/TestOpenMP_SubView_c09.cpp | 7 +-
.../openmp/TestOpenMP_SubView_c10.cpp | 7 +-
.../openmp/TestOpenMP_SubView_c11.cpp | 7 +-
.../openmp/TestOpenMP_SubView_c12.cpp | 7 +-
.../openmp/TestOpenMP_SubView_c13.cpp | 7 +-
.../core/unit_test/openmp/TestOpenMP_Task.cpp | 7 +-
.../core/unit_test/openmp/TestOpenMP_Team.cpp | 7 +-
.../openmp/TestOpenMP_TeamReductionScan.cpp | 7 +-
.../openmp/TestOpenMP_TeamScratch.cpp | 7 +-
.../openmp/TestOpenMP_TeamTeamSize.cpp | 7 +-
.../openmp/TestOpenMP_TeamVectorRange.cpp | 7 +-
.../openmp/TestOpenMP_UniqueToken.cpp | 7 +-
.../unit_test/openmp/TestOpenMP_ViewAPI_a.cpp | 7 +-
.../unit_test/openmp/TestOpenMP_ViewAPI_b.cpp | 7 +-
.../unit_test/openmp/TestOpenMP_ViewAPI_c.cpp | 7 +-
.../unit_test/openmp/TestOpenMP_ViewAPI_d.cpp | 7 +-
.../unit_test/openmp/TestOpenMP_ViewAPI_e.cpp | 7 +-
.../TestOpenMP_ViewLayoutStrideAssignment.cpp | 7 +-
.../openmp/TestOpenMP_ViewMapping_a.cpp | 7 +-
.../openmp/TestOpenMP_ViewMapping_b.cpp | 7 +-
.../openmp/TestOpenMP_ViewMapping_subview.cpp | 7 +-
.../openmp/TestOpenMP_ViewOfClass.cpp | 7 +-
.../openmp/TestOpenMP_ViewResize.cpp | 7 +-
.../openmp/TestOpenMP_View_64bit.cpp | 7 +-
.../unit_test/openmp/TestOpenMP_WorkGraph.cpp | 7 +-
.../openmptarget/TestOpenMPTarget.hpp | 7 +-
...PTarget_AtomicOperations_complexdouble.cpp | 7 +-
...MPTarget_AtomicOperations_complexfloat.cpp | 7 +-
...stOpenMPTarget_AtomicOperations_double.cpp | 7 +-
...estOpenMPTarget_AtomicOperations_float.cpp | 7 +-
.../TestOpenMPTarget_AtomicOperations_int.cpp | 7 +-
...tOpenMPTarget_AtomicOperations_longint.cpp | 7 +-
...nMPTarget_AtomicOperations_longlongint.cpp | 7 +-
...nMPTarget_AtomicOperations_unsignedint.cpp | 7 +-
...arget_AtomicOperations_unsignedlongint.cpp | 7 +-
.../TestOpenMPTarget_AtomicViews.cpp | 7 +-
.../openmptarget/TestOpenMPTarget_Atomics.cpp | 7 +-
.../TestOpenMPTarget_Category.hpp | 7 +-
.../openmptarget/TestOpenMPTarget_Complex.cpp | 7 +-
.../TestOpenMPTarget_DeepCopyAlignment.cpp | 7 +-
.../openmptarget/TestOpenMPTarget_Init.cpp | 7 +-
.../TestOpenMPTarget_MDRange_a.cpp | 7 +-
.../TestOpenMPTarget_MDRange_b.cpp | 7 +-
.../TestOpenMPTarget_MDRange_c.cpp | 7 +-
.../TestOpenMPTarget_MDRange_d.cpp | 7 +-
.../TestOpenMPTarget_MDRange_e.cpp | 7 +-
.../openmptarget/TestOpenMPTarget_Other.cpp | 7 +-
.../TestOpenMPTarget_RangePolicy.cpp | 7 +-
.../TestOpenMPTarget_Reducers_a.cpp | 7 +-
.../TestOpenMPTarget_Reducers_b.cpp | 7 +-
.../TestOpenMPTarget_Reducers_c.cpp | 7 +-
.../TestOpenMPTarget_Reducers_d.cpp | 7 +-
.../TestOpenMPTarget_Reductions.cpp | 7 +-
.../openmptarget/TestOpenMPTarget_Scan.cpp | 7 +-
.../TestOpenMPTarget_SharedAlloc.cpp | 7 +-
.../TestOpenMPTarget_SubView_a.cpp | 7 +-
.../TestOpenMPTarget_SubView_b.cpp | 7 +-
.../TestOpenMPTarget_SubView_c01.cpp | 7 +-
.../TestOpenMPTarget_SubView_c02.cpp | 7 +-
.../TestOpenMPTarget_SubView_c03.cpp | 7 +-
.../TestOpenMPTarget_SubView_c04.cpp | 7 +-
.../TestOpenMPTarget_SubView_c05.cpp | 7 +-
.../TestOpenMPTarget_SubView_c06.cpp | 7 +-
.../TestOpenMPTarget_SubView_c07.cpp | 7 +-
.../TestOpenMPTarget_SubView_c08.cpp | 7 +-
.../TestOpenMPTarget_SubView_c09.cpp | 7 +-
.../TestOpenMPTarget_SubView_c10.cpp | 7 +-
.../TestOpenMPTarget_SubView_c11.cpp | 7 +-
.../TestOpenMPTarget_SubView_c12.cpp | 7 +-
.../openmptarget/TestOpenMPTarget_Team.cpp | 7 +-
.../TestOpenMPTarget_TeamReductionScan.cpp | 7 +-
.../TestOpenMPTarget_TeamScratch.cpp | 7 +-
.../TestOpenMPTarget_ViewAPI_a.cpp | 7 +-
.../TestOpenMPTarget_ViewAPI_b.cpp | 7 +-
.../TestOpenMPTarget_ViewAPI_c.cpp | 7 +-
.../TestOpenMPTarget_ViewAPI_d.cpp | 7 +-
.../TestOpenMPTarget_ViewAPI_e.cpp | 7 +-
.../TestOpenMPTarget_ViewMapping_a.cpp | 7 +-
.../TestOpenMPTarget_ViewMapping_b.cpp | 7 +-
.../TestOpenMPTarget_ViewMapping_subview.cpp | 7 +-
.../TestOpenMPTarget_ViewOfClass.cpp | 7 +-
...threads_AtomicOperations_complexdouble.cpp | 7 +-
...qthreads_AtomicOperations_complexfloat.cpp | 7 +-
.../TestQqthreads_AtomicOperations_double.cpp | 7 +-
.../TestQqthreads_AtomicOperations_float.cpp | 7 +-
.../TestQqthreads_AtomicOperations_int.cpp | 7 +-
...TestQqthreads_AtomicOperations_longint.cpp | 7 +-
...Qqthreads_AtomicOperations_longlongint.cpp | 7 +-
...Qqthreads_AtomicOperations_unsignedint.cpp | 7 +-
...reads_AtomicOperations_unsignedlongint.cpp | 7 +-
.../qthreads/TestQqthreads_MDRange_a.cpp | 7 +-
.../qthreads/TestQqthreads_MDRange_b.cpp | 7 +-
.../qthreads/TestQqthreads_MDRange_c.cpp | 7 +-
.../qthreads/TestQqthreads_MDRange_d.cpp | 7 +-
.../qthreads/TestQqthreads_MDRange_e.cpp | 7 +-
.../qthreads/TestQqthreads_ViewAPI_a.cpp | 7 +-
.../qthreads/TestQqthreads_ViewAPI_b.cpp | 7 +-
.../qthreads/TestQqthreads_ViewAPI_c.cpp | 7 +-
.../qthreads/TestQqthreads_ViewAPI_d.cpp | 7 +-
.../qthreads/TestQqthreads_ViewAPI_e.cpp | 7 +-
.../core/unit_test/qthreads/TestQthreads.hpp | 7 +-
.../qthreads/TestQthreads_Atomics.cpp | 7 +-
.../qthreads/TestQthreads_Category.hpp | 7 +-
.../TestQthreads_DeepCopyAlignment.cpp | 7 +-
.../unit_test/qthreads/TestQthreads_Other.cpp | 7 +-
.../qthreads/TestQthreads_Reductions.cpp | 7 +-
.../qthreads/TestQthreads_SubView_a.cpp | 7 +-
.../qthreads/TestQthreads_SubView_b.cpp | 7 +-
.../qthreads/TestQthreads_SubView_c01.cpp | 7 +-
.../qthreads/TestQthreads_SubView_c02.cpp | 7 +-
.../qthreads/TestQthreads_SubView_c03.cpp | 7 +-
.../qthreads/TestQthreads_SubView_c04.cpp | 7 +-
.../qthreads/TestQthreads_SubView_c05.cpp | 7 +-
.../qthreads/TestQthreads_SubView_c06.cpp | 7 +-
.../qthreads/TestQthreads_SubView_c07.cpp | 7 +-
.../qthreads/TestQthreads_SubView_c08.cpp | 7 +-
.../qthreads/TestQthreads_SubView_c09.cpp | 7 +-
.../qthreads/TestQthreads_SubView_c10.cpp | 7 +-
.../qthreads/TestQthreads_SubView_c11.cpp | 7 +-
.../qthreads/TestQthreads_SubView_c12.cpp | 7 +-
.../qthreads/TestQthreads_SubView_c13.cpp | 7 +-
.../unit_test/qthreads/TestQthreads_Team.cpp | 7 +-
.../qthreads/TestQthreads_ViewAPI_a.cpp | 7 +-
.../qthreads/TestQthreads_ViewAPI_b.cpp | 7 +-
.../rocm/TestROCmHostPinned_Category.hpp | 7 +-
.../rocm/TestROCmHostPinned_SharedAlloc.cpp | 7 +-
.../rocm/TestROCmHostPinned_ViewAPI_a.cpp | 7 +-
.../rocm/TestROCmHostPinned_ViewAPI_b.cpp | 7 +-
.../rocm/TestROCmHostPinned_ViewAPI_c.cpp | 7 +-
.../rocm/TestROCmHostPinned_ViewAPI_d.cpp | 7 +-
.../rocm/TestROCmHostPinned_ViewAPI_e.cpp | 7 +-
.../rocm/TestROCmHostPinned_ViewCopy.cpp | 7 +-
.../rocm/TestROCmHostPinned_ViewMapping_a.cpp | 7 +-
.../rocm/TestROCmHostPinned_ViewMapping_b.cpp | 7 +-
...TestROCmHostPinned_ViewMapping_subview.cpp | 7 +-
.../rocm/TestROCmHostPinned_View_64bit.cpp | 7 +-
.../rocm/TestROCm_AtomicOperations_double.cpp | 7 +-
.../rocm/TestROCm_AtomicOperations_float.cpp | 7 +-
.../rocm/TestROCm_AtomicOperations_int.cpp | 7 +-
.../TestROCm_AtomicOperations_longint.cpp | 7 +-
.../TestROCm_AtomicOperations_longlongint.cpp | 7 +-
.../TestROCm_AtomicOperations_unsignedint.cpp | 7 +-
...tROCm_AtomicOperations_unsignedlongint.cpp | 7 +-
.../unit_test/rocm/TestROCm_AtomicViews.cpp | 7 +-
.../core/unit_test/rocm/TestROCm_Atomics.cpp | 7 +-
.../core/unit_test/rocm/TestROCm_Category.hpp | 7 +-
.../core/unit_test/rocm/TestROCm_Complex.cpp | 7 +-
.../core/unit_test/rocm/TestROCm_Crs.cpp | 7 +-
.../rocm/TestROCm_DeepCopyAlignment.cpp | 7 +-
.../core/unit_test/rocm/TestROCm_Init.cpp | 7 +-
.../rocm/TestROCm_MDRangeReduce_a.cpp | 7 +-
.../rocm/TestROCm_MDRangeReduce_b.cpp | 7 +-
.../rocm/TestROCm_MDRangeReduce_c.cpp | 7 +-
.../rocm/TestROCm_MDRangeReduce_d.cpp | 7 +-
.../rocm/TestROCm_MDRangeReduce_e.cpp | 7 +-
.../unit_test/rocm/TestROCm_MDRange_a.cpp | 7 +-
.../unit_test/rocm/TestROCm_MDRange_b.cpp | 7 +-
.../unit_test/rocm/TestROCm_MDRange_c.cpp | 7 +-
.../unit_test/rocm/TestROCm_MDRange_d.cpp | 7 +-
.../unit_test/rocm/TestROCm_MDRange_e.cpp | 7 +-
.../core/unit_test/rocm/TestROCm_Other.cpp | 7 +-
.../unit_test/rocm/TestROCm_RangePolicy.cpp | 7 +-
.../unit_test/rocm/TestROCm_Reducers_a.cpp | 7 +-
.../unit_test/rocm/TestROCm_Reducers_b.cpp | 7 +-
.../unit_test/rocm/TestROCm_Reducers_c.cpp | 7 +-
.../unit_test/rocm/TestROCm_Reducers_d.cpp | 7 +-
.../unit_test/rocm/TestROCm_Reductions.cpp | 7 +-
.../core/unit_test/rocm/TestROCm_Scan.cpp | 7 +-
.../unit_test/rocm/TestROCm_SharedAlloc.cpp | 7 +-
.../core/unit_test/rocm/TestROCm_Spaces.cpp | 7 +-
.../unit_test/rocm/TestROCm_SubView_a.cpp | 7 +-
.../unit_test/rocm/TestROCm_SubView_b.cpp | 7 +-
.../unit_test/rocm/TestROCm_SubView_c01.cpp | 7 +-
.../unit_test/rocm/TestROCm_SubView_c02.cpp | 7 +-
.../unit_test/rocm/TestROCm_SubView_c03.cpp | 7 +-
.../unit_test/rocm/TestROCm_SubView_c04.cpp | 7 +-
.../unit_test/rocm/TestROCm_SubView_c05.cpp | 7 +-
.../unit_test/rocm/TestROCm_SubView_c06.cpp | 7 +-
.../unit_test/rocm/TestROCm_SubView_c07.cpp | 7 +-
.../unit_test/rocm/TestROCm_SubView_c08.cpp | 7 +-
.../unit_test/rocm/TestROCm_SubView_c09.cpp | 7 +-
.../unit_test/rocm/TestROCm_SubView_c10.cpp | 7 +-
.../unit_test/rocm/TestROCm_SubView_c11.cpp | 7 +-
.../unit_test/rocm/TestROCm_SubView_c12.cpp | 7 +-
.../unit_test/rocm/TestROCm_SubView_c13.cpp | 7 +-
.../core/unit_test/rocm/TestROCm_Team.cpp | 7 +-
.../rocm/TestROCm_TeamReductionScan.cpp | 7 +-
.../unit_test/rocm/TestROCm_TeamScratch.cpp | 7 +-
.../unit_test/rocm/TestROCm_TeamTeamSize.cpp | 7 +-
.../unit_test/rocm/TestROCm_ViewAPI_a.cpp | 7 +-
.../unit_test/rocm/TestROCm_ViewAPI_b.cpp | 7 +-
.../unit_test/rocm/TestROCm_ViewAPI_c.cpp | 7 +-
.../unit_test/rocm/TestROCm_ViewAPI_d.cpp | 7 +-
.../unit_test/rocm/TestROCm_ViewAPI_e.cpp | 7 +-
.../unit_test/rocm/TestROCm_ViewMapping_a.cpp | 7 +-
.../unit_test/rocm/TestROCm_ViewMapping_b.cpp | 7 +-
.../rocm/TestROCm_ViewMapping_subview.cpp | 7 +-
.../unit_test/rocm/TestROCm_ViewOfClass.cpp | 7 +-
...tSerial_AtomicOperations_complexdouble.cpp | 7 +-
...stSerial_AtomicOperations_complexfloat.cpp | 7 +-
.../TestSerial_AtomicOperations_double.cpp | 7 +-
.../TestSerial_AtomicOperations_float.cpp | 7 +-
.../TestSerial_AtomicOperations_int.cpp | 7 +-
.../TestSerial_AtomicOperations_longint.cpp | 7 +-
...estSerial_AtomicOperations_longlongint.cpp | 7 +-
...estSerial_AtomicOperations_unsignedint.cpp | 7 +-
...erial_AtomicOperations_unsignedlongint.cpp | 7 +-
.../serial/TestSerial_AtomicViews.cpp | 7 +-
.../unit_test/serial/TestSerial_Atomics.cpp | 7 +-
.../unit_test/serial/TestSerial_Category.hpp | 7 +-
.../unit_test/serial/TestSerial_Complex.cpp | 7 +-
.../core/unit_test/serial/TestSerial_Crs.cpp | 7 +-
.../serial/TestSerial_DeepCopyAlignment.cpp | 7 +-
.../serial/TestSerial_FunctorAnalysis.cpp | 7 +-
.../core/unit_test/serial/TestSerial_Init.cpp | 7 +-
.../serial/TestSerial_LocalDeepCopy.cpp | 7 +-
.../unit_test/serial/TestSerial_MDRange_a.cpp | 7 +-
.../unit_test/serial/TestSerial_MDRange_b.cpp | 7 +-
.../unit_test/serial/TestSerial_MDRange_c.cpp | 7 +-
.../unit_test/serial/TestSerial_MDRange_d.cpp | 7 +-
.../unit_test/serial/TestSerial_MDRange_e.cpp | 7 +-
.../unit_test/serial/TestSerial_Other.cpp | 7 +-
.../serial/TestSerial_RangePolicy.cpp | 7 +-
.../serial/TestSerial_Reducers_a.cpp | 7 +-
.../serial/TestSerial_Reducers_b.cpp | 7 +-
.../serial/TestSerial_Reducers_c.cpp | 7 +-
.../serial/TestSerial_Reducers_d.cpp | 7 +-
.../serial/TestSerial_Reductions.cpp | 7 +-
.../TestSerial_Reductions_DeviceView.cpp | 7 +-
.../core/unit_test/serial/TestSerial_Scan.cpp | 7 +-
.../serial/TestSerial_SharedAlloc.cpp | 7 +-
.../unit_test/serial/TestSerial_SubView_a.cpp | 7 +-
.../unit_test/serial/TestSerial_SubView_b.cpp | 7 +-
.../serial/TestSerial_SubView_c01.cpp | 7 +-
.../serial/TestSerial_SubView_c02.cpp | 7 +-
.../serial/TestSerial_SubView_c03.cpp | 7 +-
.../serial/TestSerial_SubView_c04.cpp | 7 +-
.../serial/TestSerial_SubView_c05.cpp | 7 +-
.../serial/TestSerial_SubView_c06.cpp | 7 +-
.../serial/TestSerial_SubView_c07.cpp | 7 +-
.../serial/TestSerial_SubView_c08.cpp | 7 +-
.../serial/TestSerial_SubView_c09.cpp | 7 +-
.../serial/TestSerial_SubView_c10.cpp | 7 +-
.../serial/TestSerial_SubView_c11.cpp | 7 +-
.../serial/TestSerial_SubView_c12.cpp | 7 +-
.../serial/TestSerial_SubView_c13.cpp | 7 +-
.../core/unit_test/serial/TestSerial_Task.cpp | 7 +-
.../core/unit_test/serial/TestSerial_Team.cpp | 7 +-
.../serial/TestSerial_TeamReductionScan.cpp | 7 +-
.../serial/TestSerial_TeamScratch.cpp | 7 +-
.../serial/TestSerial_TeamTeamSize.cpp | 7 +-
.../serial/TestSerial_TeamVectorRange.cpp | 7 +-
.../serial/TestSerial_UniqueToken.cpp | 7 +-
.../unit_test/serial/TestSerial_ViewAPI_a.cpp | 7 +-
.../unit_test/serial/TestSerial_ViewAPI_b.cpp | 7 +-
.../unit_test/serial/TestSerial_ViewAPI_c.cpp | 7 +-
.../unit_test/serial/TestSerial_ViewAPI_d.cpp | 7 +-
.../unit_test/serial/TestSerial_ViewAPI_e.cpp | 7 +-
.../TestSerial_ViewLayoutStrideAssignment.cpp | 7 +-
.../serial/TestSerial_ViewMapping_a.cpp | 7 +-
.../serial/TestSerial_ViewMapping_b.cpp | 7 +-
.../serial/TestSerial_ViewMapping_subview.cpp | 7 +-
.../serial/TestSerial_ViewOfClass.cpp | 7 +-
.../serial/TestSerial_ViewResize.cpp | 7 +-
.../serial/TestSerial_View_64bit.cpp | 7 +-
.../unit_test/serial/TestSerial_WorkGraph.cpp | 7 +-
.../unit_test/standalone/UnitTestMainInit.cpp | 7 +-
...Threads_AtomicOperations_complexdouble.cpp | 7 +-
...tThreads_AtomicOperations_complexfloat.cpp | 7 +-
.../TestThreads_AtomicOperations_double.cpp | 7 +-
.../TestThreads_AtomicOperations_float.cpp | 7 +-
.../TestThreads_AtomicOperations_int.cpp | 7 +-
.../TestThreads_AtomicOperations_longint.cpp | 7 +-
...stThreads_AtomicOperations_longlongint.cpp | 7 +-
...stThreads_AtomicOperations_unsignedint.cpp | 7 +-
...reads_AtomicOperations_unsignedlongint.cpp | 7 +-
.../threads/TestThreads_AtomicViews.cpp | 7 +-
.../unit_test/threads/TestThreads_Atomics.cpp | 7 +-
.../threads/TestThreads_Category.hpp | 7 +-
.../unit_test/threads/TestThreads_Complex.cpp | 7 +-
.../unit_test/threads/TestThreads_Crs.cpp | 7 +-
.../threads/TestThreads_DeepCopyAlignment.cpp | 7 +-
.../threads/TestThreads_FunctorAnalysis.cpp | 7 +-
.../unit_test/threads/TestThreads_Init.cpp | 7 +-
.../threads/TestThreads_LocalDeepCopy.cpp | 7 +-
.../threads/TestThreads_MDRange_a.cpp | 7 +-
.../threads/TestThreads_MDRange_b.cpp | 7 +-
.../threads/TestThreads_MDRange_c.cpp | 7 +-
.../threads/TestThreads_MDRange_d.cpp | 7 +-
.../threads/TestThreads_MDRange_e.cpp | 7 +-
.../unit_test/threads/TestThreads_Other.cpp | 7 +-
.../threads/TestThreads_RangePolicy.cpp | 7 +-
.../threads/TestThreads_Reducers_a.cpp | 7 +-
.../threads/TestThreads_Reducers_b.cpp | 7 +-
.../threads/TestThreads_Reducers_c.cpp | 7 +-
.../threads/TestThreads_Reducers_d.cpp | 7 +-
.../threads/TestThreads_Reductions.cpp | 7 +-
.../TestThreads_Reductions_DeviceView.cpp | 7 +-
.../unit_test/threads/TestThreads_Scan.cpp | 7 +-
.../threads/TestThreads_SharedAlloc.cpp | 7 +-
.../threads/TestThreads_SubView_a.cpp | 7 +-
.../threads/TestThreads_SubView_b.cpp | 7 +-
.../threads/TestThreads_SubView_c01.cpp | 7 +-
.../threads/TestThreads_SubView_c02.cpp | 7 +-
.../threads/TestThreads_SubView_c03.cpp | 7 +-
.../threads/TestThreads_SubView_c04.cpp | 7 +-
.../threads/TestThreads_SubView_c05.cpp | 7 +-
.../threads/TestThreads_SubView_c06.cpp | 7 +-
.../threads/TestThreads_SubView_c07.cpp | 7 +-
.../threads/TestThreads_SubView_c08.cpp | 7 +-
.../threads/TestThreads_SubView_c09.cpp | 7 +-
.../threads/TestThreads_SubView_c10.cpp | 7 +-
.../threads/TestThreads_SubView_c11.cpp | 7 +-
.../threads/TestThreads_SubView_c12.cpp | 7 +-
.../threads/TestThreads_SubView_c13.cpp | 7 +-
.../unit_test/threads/TestThreads_Team.cpp | 7 +-
.../threads/TestThreads_TeamReductionScan.cpp | 7 +-
.../threads/TestThreads_TeamScratch.cpp | 7 +-
.../threads/TestThreads_TeamTeamSize.cpp | 7 +-
.../threads/TestThreads_TeamVectorRange.cpp | 7 +-
.../threads/TestThreads_UniqueToken.cpp | 7 +-
.../threads/TestThreads_ViewAPI_a.cpp | 7 +-
.../threads/TestThreads_ViewAPI_b.cpp | 7 +-
.../threads/TestThreads_ViewAPI_c.cpp | 7 +-
.../threads/TestThreads_ViewAPI_d.cpp | 7 +-
.../threads/TestThreads_ViewAPI_e.cpp | 7 +-
...TestThreads_ViewLayoutStrideAssignment.cpp | 7 +-
.../threads/TestThreads_ViewMapping_a.cpp | 7 +-
.../threads/TestThreads_ViewMapping_b.cpp | 7 +-
.../TestThreads_ViewMapping_subview.cpp | 7 +-
.../threads/TestThreads_ViewOfClass.cpp | 7 +-
.../threads/TestThreads_ViewResize.cpp | 7 +-
.../threads/TestThreads_View_64bit.cpp | 7 +-
.../threads/TestThreads_WorkGraph.cpp | 7 +-
.../build_cmake_in_tree/cmake_example.cpp | 7 +-
.../build_cmake_installed/cmake_example.cpp | 7 +-
.../example/query_device/query_device.cpp | 7 +-
.../tutorial/01_hello_world/hello_world.cpp | 7 +-
.../hello_world_lambda.cpp | 7 +-
.../02_simple_reduce/simple_reduce.cpp | 7 +-
.../simple_reduce_lambda.cpp | 7 +-
.../tutorial/03_simple_view/simple_view.cpp | 7 +-
.../simple_view_lambda.cpp | 7 +-
.../simple_memoryspaces.cpp | 7 +-
.../05_simple_atomics/simple_atomics.cpp | 7 +-
.../simple_mdrangepolicy.cpp | 7 +-
.../01_data_layouts/data_layouts.cpp | 7 +-
.../02_memory_traits/memory_traits.cpp | 7 +-
.../Advanced_Views/03_subviews/subviews.cpp | 7 +-
.../Advanced_Views/04_dualviews/dual_view.cpp | 7 +-
.../05_NVIDIA_UVM/uvm_example.cpp | 7 +-
.../overlapping_deepcopy.cpp | 7 +-
.../01_random_numbers/random_numbers.cpp | 7 +-
.../01_thread_teams/thread_teams.cpp | 7 +-
.../thread_teams_lambda.cpp | 7 +-
.../nested_parallel_for.cpp | 7 +-
.../03_vectorization/vectorization.cpp | 7 +-
.../04_team_scan/team_scan.cpp | 7 +-
.../launch_bounds/launch_bounds_reduce.cpp | 7 +-
packages/kokkos/master_history.txt | 2 +-
.../scripts/testing_scripts/TestEXEC_TEST.cpp | 7 +-
packages/kokkos/scripts/update-copyright | 5 ++
1944 files changed, 7908 insertions(+), 5970 deletions(-)
create mode 100755 packages/kokkos/scripts/update-copyright
diff --git a/packages/kokkos/.gitrepo b/packages/kokkos/.gitrepo
index 26740d6db..455657c18 100644
--- a/packages/kokkos/.gitrepo
+++ b/packages/kokkos/.gitrepo
@@ -6,7 +6,7 @@
[subrepo]
remote = git@github.com:kokkos/kokkos.git
branch = master
- commit = 81aa135ff95470f8af59303ab2c0af8f3936e536
- parent = c3ff65d4f30a0d598a51b2e98fafe52a053418d7
+ commit = 586d07ba08e2bb9aae6fe644cf7ac16853dd32bd
+ parent = f31bb613458ebd072cb4dd51da5ce01b18e16f80
cmdver = 0.4.1
method = merge
diff --git a/packages/kokkos/Copyright.txt b/packages/kokkos/Copyright.txt
index 50b76995a..89f7daf06 100644
--- a/packages/kokkos/Copyright.txt
+++ b/packages/kokkos/Copyright.txt
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/LICENSE b/packages/kokkos/LICENSE
index c68a8a2a9..e2fe85c96 100644
--- a/packages/kokkos/LICENSE
+++ b/packages/kokkos/LICENSE
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/algorithms/src/Kokkos_Random.hpp b/packages/kokkos/algorithms/src/Kokkos_Random.hpp
index ebbd5d896..52510f1cd 100644
--- a/packages/kokkos/algorithms/src/Kokkos_Random.hpp
+++ b/packages/kokkos/algorithms/src/Kokkos_Random.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/algorithms/src/Kokkos_Sort.hpp b/packages/kokkos/algorithms/src/Kokkos_Sort.hpp
index e64b3276a..405b179f5 100644
--- a/packages/kokkos/algorithms/src/Kokkos_Sort.hpp
+++ b/packages/kokkos/algorithms/src/Kokkos_Sort.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/algorithms/unit_tests/TestCuda.cpp b/packages/kokkos/algorithms/unit_tests/TestCuda.cpp
index 674571f9b..9562af63a 100644
--- a/packages/kokkos/algorithms/unit_tests/TestCuda.cpp
+++ b/packages/kokkos/algorithms/unit_tests/TestCuda.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/algorithms/unit_tests/TestHPX.cpp b/packages/kokkos/algorithms/unit_tests/TestHPX.cpp
index d0b2729ae..84cb61448 100644
--- a/packages/kokkos/algorithms/unit_tests/TestHPX.cpp
+++ b/packages/kokkos/algorithms/unit_tests/TestHPX.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/algorithms/unit_tests/TestOpenMP.cpp b/packages/kokkos/algorithms/unit_tests/TestOpenMP.cpp
index ba5455cff..e6bfcb9b5 100644
--- a/packages/kokkos/algorithms/unit_tests/TestOpenMP.cpp
+++ b/packages/kokkos/algorithms/unit_tests/TestOpenMP.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/algorithms/unit_tests/TestROCm.cpp b/packages/kokkos/algorithms/unit_tests/TestROCm.cpp
index 23cde2786..d1d59c137 100644
--- a/packages/kokkos/algorithms/unit_tests/TestROCm.cpp
+++ b/packages/kokkos/algorithms/unit_tests/TestROCm.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/algorithms/unit_tests/TestRandom.hpp b/packages/kokkos/algorithms/unit_tests/TestRandom.hpp
index 74eeaa4b0..bec648a47 100644
--- a/packages/kokkos/algorithms/unit_tests/TestRandom.hpp
+++ b/packages/kokkos/algorithms/unit_tests/TestRandom.hpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/algorithms/unit_tests/TestSerial.cpp b/packages/kokkos/algorithms/unit_tests/TestSerial.cpp
index ec926ad43..01f36b27d 100644
--- a/packages/kokkos/algorithms/unit_tests/TestSerial.cpp
+++ b/packages/kokkos/algorithms/unit_tests/TestSerial.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/algorithms/unit_tests/TestSort.hpp b/packages/kokkos/algorithms/unit_tests/TestSort.hpp
index 97b2cbea4..9ceb53fff 100644
--- a/packages/kokkos/algorithms/unit_tests/TestSort.hpp
+++ b/packages/kokkos/algorithms/unit_tests/TestSort.hpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/algorithms/unit_tests/TestThreads.cpp b/packages/kokkos/algorithms/unit_tests/TestThreads.cpp
index dacb93c29..733b76217 100644
--- a/packages/kokkos/algorithms/unit_tests/TestThreads.cpp
+++ b/packages/kokkos/algorithms/unit_tests/TestThreads.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/algorithms/unit_tests/UnitTestMain.cpp b/packages/kokkos/algorithms/unit_tests/UnitTestMain.cpp
index 1d26f988e..c62c74058 100644
--- a/packages/kokkos/algorithms/unit_tests/UnitTestMain.cpp
+++ b/packages/kokkos/algorithms/unit_tests/UnitTestMain.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/benchmarks/bytes_and_flops/bench.hpp b/packages/kokkos/benchmarks/bytes_and_flops/bench.hpp
index 4c990e3e2..419702574 100644
--- a/packages/kokkos/benchmarks/bytes_and_flops/bench.hpp
+++ b/packages/kokkos/benchmarks/bytes_and_flops/bench.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/benchmarks/bytes_and_flops/bench_stride.hpp b/packages/kokkos/benchmarks/bytes_and_flops/bench_stride.hpp
index 840737a10..1b0a77be4 100644
--- a/packages/kokkos/benchmarks/bytes_and_flops/bench_stride.hpp
+++ b/packages/kokkos/benchmarks/bytes_and_flops/bench_stride.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/benchmarks/bytes_and_flops/bench_unroll_stride.hpp b/packages/kokkos/benchmarks/bytes_and_flops/bench_unroll_stride.hpp
index d15d2d3fa..ebd2c39f5 100644
--- a/packages/kokkos/benchmarks/bytes_and_flops/bench_unroll_stride.hpp
+++ b/packages/kokkos/benchmarks/bytes_and_flops/bench_unroll_stride.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/benchmarks/bytes_and_flops/main.cpp b/packages/kokkos/benchmarks/bytes_and_flops/main.cpp
index 6ce0bc6d6..3eceba78f 100644
--- a/packages/kokkos/benchmarks/bytes_and_flops/main.cpp
+++ b/packages/kokkos/benchmarks/bytes_and_flops/main.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/benchmarks/gather/gather.hpp b/packages/kokkos/benchmarks/gather/gather.hpp
index fe17cfa38..4ecaad045 100644
--- a/packages/kokkos/benchmarks/gather/gather.hpp
+++ b/packages/kokkos/benchmarks/gather/gather.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/benchmarks/gather/gather_unroll.hpp b/packages/kokkos/benchmarks/gather/gather_unroll.hpp
index 51d602c21..e816c80e6 100644
--- a/packages/kokkos/benchmarks/gather/gather_unroll.hpp
+++ b/packages/kokkos/benchmarks/gather/gather_unroll.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/benchmarks/gather/main.cpp b/packages/kokkos/benchmarks/gather/main.cpp
index 9d018b214..d6b9c983a 100644
--- a/packages/kokkos/benchmarks/gather/main.cpp
+++ b/packages/kokkos/benchmarks/gather/main.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/benchmarks/gups/gups-kokkos.cc b/packages/kokkos/benchmarks/gups/gups-kokkos.cc
index 4602adda7..40a8bed94 100644
--- a/packages/kokkos/benchmarks/gups/gups-kokkos.cc
+++ b/packages/kokkos/benchmarks/gups/gups-kokkos.cc
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/benchmarks/policy_performance/main.cpp b/packages/kokkos/benchmarks/policy_performance/main.cpp
index 0c237a0ad..9ed733a5c 100644
--- a/packages/kokkos/benchmarks/policy_performance/main.cpp
+++ b/packages/kokkos/benchmarks/policy_performance/main.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/benchmarks/policy_performance/policy_perf_test.hpp b/packages/kokkos/benchmarks/policy_performance/policy_perf_test.hpp
index a1e0a8330..87bc36f32 100644
--- a/packages/kokkos/benchmarks/policy_performance/policy_perf_test.hpp
+++ b/packages/kokkos/benchmarks/policy_performance/policy_perf_test.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/benchmarks/stream/stream-kokkos.cc b/packages/kokkos/benchmarks/stream/stream-kokkos.cc
index 370995432..0a4ca84cc 100644
--- a/packages/kokkos/benchmarks/stream/stream-kokkos.cc
+++ b/packages/kokkos/benchmarks/stream/stream-kokkos.cc
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/performance_tests/TestCuda.cpp b/packages/kokkos/containers/performance_tests/TestCuda.cpp
index 8cef83610..8caf478e5 100644
--- a/packages/kokkos/containers/performance_tests/TestCuda.cpp
+++ b/packages/kokkos/containers/performance_tests/TestCuda.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/performance_tests/TestDynRankView.hpp b/packages/kokkos/containers/performance_tests/TestDynRankView.hpp
index 15c9f7a71..1abe4b3b3 100644
--- a/packages/kokkos/containers/performance_tests/TestDynRankView.hpp
+++ b/packages/kokkos/containers/performance_tests/TestDynRankView.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/performance_tests/TestGlobal2LocalIds.hpp b/packages/kokkos/containers/performance_tests/TestGlobal2LocalIds.hpp
index 58ce95c9f..b6ec6abf3 100644
--- a/packages/kokkos/containers/performance_tests/TestGlobal2LocalIds.hpp
+++ b/packages/kokkos/containers/performance_tests/TestGlobal2LocalIds.hpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/performance_tests/TestHPX.cpp b/packages/kokkos/containers/performance_tests/TestHPX.cpp
index 8037e9268..f93bc45ce 100644
--- a/packages/kokkos/containers/performance_tests/TestHPX.cpp
+++ b/packages/kokkos/containers/performance_tests/TestHPX.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/performance_tests/TestMain.cpp b/packages/kokkos/containers/performance_tests/TestMain.cpp
index 29ce085e3..357526090 100644
--- a/packages/kokkos/containers/performance_tests/TestMain.cpp
+++ b/packages/kokkos/containers/performance_tests/TestMain.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/performance_tests/TestOpenMP.cpp b/packages/kokkos/containers/performance_tests/TestOpenMP.cpp
index ffa10ebe3..e98ea8cdb 100644
--- a/packages/kokkos/containers/performance_tests/TestOpenMP.cpp
+++ b/packages/kokkos/containers/performance_tests/TestOpenMP.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/performance_tests/TestROCm.cpp b/packages/kokkos/containers/performance_tests/TestROCm.cpp
index dd27a958e..95ccc5e7b 100644
--- a/packages/kokkos/containers/performance_tests/TestROCm.cpp
+++ b/packages/kokkos/containers/performance_tests/TestROCm.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/performance_tests/TestScatterView.hpp b/packages/kokkos/containers/performance_tests/TestScatterView.hpp
index 008367234..be66a9715 100644
--- a/packages/kokkos/containers/performance_tests/TestScatterView.hpp
+++ b/packages/kokkos/containers/performance_tests/TestScatterView.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/performance_tests/TestThreads.cpp b/packages/kokkos/containers/performance_tests/TestThreads.cpp
index 9cebb07b4..8ee234db4 100644
--- a/packages/kokkos/containers/performance_tests/TestThreads.cpp
+++ b/packages/kokkos/containers/performance_tests/TestThreads.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/performance_tests/TestUnorderedMapPerformance.hpp b/packages/kokkos/containers/performance_tests/TestUnorderedMapPerformance.hpp
index 078fcb223..73f3b090b 100644
--- a/packages/kokkos/containers/performance_tests/TestUnorderedMapPerformance.hpp
+++ b/packages/kokkos/containers/performance_tests/TestUnorderedMapPerformance.hpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/src/Kokkos_Bitset.hpp b/packages/kokkos/containers/src/Kokkos_Bitset.hpp
index e86ac102c..5810dbce8 100644
--- a/packages/kokkos/containers/src/Kokkos_Bitset.hpp
+++ b/packages/kokkos/containers/src/Kokkos_Bitset.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/src/Kokkos_DualView.hpp b/packages/kokkos/containers/src/Kokkos_DualView.hpp
index 5df222c73..ed9a595bf 100644
--- a/packages/kokkos/containers/src/Kokkos_DualView.hpp
+++ b/packages/kokkos/containers/src/Kokkos_DualView.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/src/Kokkos_DynRankView.hpp b/packages/kokkos/containers/src/Kokkos_DynRankView.hpp
index 9bdb7e414..9b0d4f0fe 100644
--- a/packages/kokkos/containers/src/Kokkos_DynRankView.hpp
+++ b/packages/kokkos/containers/src/Kokkos_DynRankView.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/src/Kokkos_DynamicView.hpp b/packages/kokkos/containers/src/Kokkos_DynamicView.hpp
index e44f45dbf..cf02cf66a 100644
--- a/packages/kokkos/containers/src/Kokkos_DynamicView.hpp
+++ b/packages/kokkos/containers/src/Kokkos_DynamicView.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/src/Kokkos_ErrorReporter.hpp b/packages/kokkos/containers/src/Kokkos_ErrorReporter.hpp
index 91d3e6cfa..91d75b0f4 100644
--- a/packages/kokkos/containers/src/Kokkos_ErrorReporter.hpp
+++ b/packages/kokkos/containers/src/Kokkos_ErrorReporter.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/src/Kokkos_Functional.hpp b/packages/kokkos/containers/src/Kokkos_Functional.hpp
index 7bd62a43f..c1a850b1d 100644
--- a/packages/kokkos/containers/src/Kokkos_Functional.hpp
+++ b/packages/kokkos/containers/src/Kokkos_Functional.hpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/src/Kokkos_ScatterView.hpp b/packages/kokkos/containers/src/Kokkos_ScatterView.hpp
index 771ad1e63..b659b70b3 100644
--- a/packages/kokkos/containers/src/Kokkos_ScatterView.hpp
+++ b/packages/kokkos/containers/src/Kokkos_ScatterView.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/src/Kokkos_StaticCrsGraph.hpp b/packages/kokkos/containers/src/Kokkos_StaticCrsGraph.hpp
index 3066f5762..ee250f9f2 100644
--- a/packages/kokkos/containers/src/Kokkos_StaticCrsGraph.hpp
+++ b/packages/kokkos/containers/src/Kokkos_StaticCrsGraph.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/src/Kokkos_UnorderedMap.hpp b/packages/kokkos/containers/src/Kokkos_UnorderedMap.hpp
index b6d8ad61b..298d5f6c3 100644
--- a/packages/kokkos/containers/src/Kokkos_UnorderedMap.hpp
+++ b/packages/kokkos/containers/src/Kokkos_UnorderedMap.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/src/Kokkos_Vector.hpp b/packages/kokkos/containers/src/Kokkos_Vector.hpp
index 489448f9b..da1996283 100644
--- a/packages/kokkos/containers/src/Kokkos_Vector.hpp
+++ b/packages/kokkos/containers/src/Kokkos_Vector.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/src/impl/Kokkos_Bitset_impl.hpp b/packages/kokkos/containers/src/impl/Kokkos_Bitset_impl.hpp
index 9b30734a1..22b8a541d 100644
--- a/packages/kokkos/containers/src/impl/Kokkos_Bitset_impl.hpp
+++ b/packages/kokkos/containers/src/impl/Kokkos_Bitset_impl.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/src/impl/Kokkos_Functional_impl.hpp b/packages/kokkos/containers/src/impl/Kokkos_Functional_impl.hpp
index 9b1035584..6e0f9f10b 100644
--- a/packages/kokkos/containers/src/impl/Kokkos_Functional_impl.hpp
+++ b/packages/kokkos/containers/src/impl/Kokkos_Functional_impl.hpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/src/impl/Kokkos_StaticCrsGraph_factory.hpp b/packages/kokkos/containers/src/impl/Kokkos_StaticCrsGraph_factory.hpp
index 813de916a..ce6c4b637 100644
--- a/packages/kokkos/containers/src/impl/Kokkos_StaticCrsGraph_factory.hpp
+++ b/packages/kokkos/containers/src/impl/Kokkos_StaticCrsGraph_factory.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.cpp b/packages/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.cpp
index 1f1ccc733..59f1a1e4c 100644
--- a/packages/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.cpp
+++ b/packages/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.hpp b/packages/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.hpp
index 7a195af08..623cf3855 100644
--- a/packages/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.hpp
+++ b/packages/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/TestBitset.hpp b/packages/kokkos/containers/unit_tests/TestBitset.hpp
index ee1427e48..31a1e3ddb 100644
--- a/packages/kokkos/containers/unit_tests/TestBitset.hpp
+++ b/packages/kokkos/containers/unit_tests/TestBitset.hpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/TestDualView.hpp b/packages/kokkos/containers/unit_tests/TestDualView.hpp
index d3028d9ee..5755f1e9b 100644
--- a/packages/kokkos/containers/unit_tests/TestDualView.hpp
+++ b/packages/kokkos/containers/unit_tests/TestDualView.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/TestDynViewAPI.hpp b/packages/kokkos/containers/unit_tests/TestDynViewAPI.hpp
index 26c54e65d..fcd1d373c 100644
--- a/packages/kokkos/containers/unit_tests/TestDynViewAPI.hpp
+++ b/packages/kokkos/containers/unit_tests/TestDynViewAPI.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/TestDynViewAPI_generic.hpp b/packages/kokkos/containers/unit_tests/TestDynViewAPI_generic.hpp
index 242b2119f..e37ea11bb 100644
--- a/packages/kokkos/containers/unit_tests/TestDynViewAPI_generic.hpp
+++ b/packages/kokkos/containers/unit_tests/TestDynViewAPI_generic.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/TestDynViewAPI_rank12345.hpp b/packages/kokkos/containers/unit_tests/TestDynViewAPI_rank12345.hpp
index 628f14aad..308854bd8 100644
--- a/packages/kokkos/containers/unit_tests/TestDynViewAPI_rank12345.hpp
+++ b/packages/kokkos/containers/unit_tests/TestDynViewAPI_rank12345.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/TestDynViewAPI_rank67.hpp b/packages/kokkos/containers/unit_tests/TestDynViewAPI_rank67.hpp
index 323699950..2e349ba38 100644
--- a/packages/kokkos/containers/unit_tests/TestDynViewAPI_rank67.hpp
+++ b/packages/kokkos/containers/unit_tests/TestDynViewAPI_rank67.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/TestDynamicView.hpp b/packages/kokkos/containers/unit_tests/TestDynamicView.hpp
index 82859dcbb..a4976297c 100644
--- a/packages/kokkos/containers/unit_tests/TestDynamicView.hpp
+++ b/packages/kokkos/containers/unit_tests/TestDynamicView.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/TestErrorReporter.hpp b/packages/kokkos/containers/unit_tests/TestErrorReporter.hpp
index cc7a659e4..6f7be142a 100644
--- a/packages/kokkos/containers/unit_tests/TestErrorReporter.hpp
+++ b/packages/kokkos/containers/unit_tests/TestErrorReporter.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/TestOffsetView.hpp b/packages/kokkos/containers/unit_tests/TestOffsetView.hpp
index d6469ee3a..9b18707bb 100644
--- a/packages/kokkos/containers/unit_tests/TestOffsetView.hpp
+++ b/packages/kokkos/containers/unit_tests/TestOffsetView.hpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/TestScatterView.hpp b/packages/kokkos/containers/unit_tests/TestScatterView.hpp
index 0e2ed52e0..76254ca26 100644
--- a/packages/kokkos/containers/unit_tests/TestScatterView.hpp
+++ b/packages/kokkos/containers/unit_tests/TestScatterView.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/TestStaticCrsGraph.hpp b/packages/kokkos/containers/unit_tests/TestStaticCrsGraph.hpp
index faac7afb6..6121b5222 100644
--- a/packages/kokkos/containers/unit_tests/TestStaticCrsGraph.hpp
+++ b/packages/kokkos/containers/unit_tests/TestStaticCrsGraph.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/TestUnorderedMap.hpp b/packages/kokkos/containers/unit_tests/TestUnorderedMap.hpp
index 12e1b1a4f..436a4c8b7 100644
--- a/packages/kokkos/containers/unit_tests/TestUnorderedMap.hpp
+++ b/packages/kokkos/containers/unit_tests/TestUnorderedMap.hpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/TestVector.hpp b/packages/kokkos/containers/unit_tests/TestVector.hpp
index c42ea03bd..be6368ac0 100644
--- a/packages/kokkos/containers/unit_tests/TestVector.hpp
+++ b/packages/kokkos/containers/unit_tests/TestVector.hpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/TestViewCtorPropEmbeddedDim.hpp b/packages/kokkos/containers/unit_tests/TestViewCtorPropEmbeddedDim.hpp
index 87da92a9c..473e5ae87 100644
--- a/packages/kokkos/containers/unit_tests/TestViewCtorPropEmbeddedDim.hpp
+++ b/packages/kokkos/containers/unit_tests/TestViewCtorPropEmbeddedDim.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/UnitTestMain.cpp b/packages/kokkos/containers/unit_tests/UnitTestMain.cpp
index 1d26f988e..c62c74058 100644
--- a/packages/kokkos/containers/unit_tests/UnitTestMain.cpp
+++ b/packages/kokkos/containers/unit_tests/UnitTestMain.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/cuda/TestCuda_BitSet.cpp b/packages/kokkos/containers/unit_tests/cuda/TestCuda_BitSet.cpp
index 03ae53fee..3dbe9b7ac 100644
--- a/packages/kokkos/containers/unit_tests/cuda/TestCuda_BitSet.cpp
+++ b/packages/kokkos/containers/unit_tests/cuda/TestCuda_BitSet.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/cuda/TestCuda_Category.hpp b/packages/kokkos/containers/unit_tests/cuda/TestCuda_Category.hpp
index 00b43b47d..14fc58b11 100644
--- a/packages/kokkos/containers/unit_tests/cuda/TestCuda_Category.hpp
+++ b/packages/kokkos/containers/unit_tests/cuda/TestCuda_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/cuda/TestCuda_DualView.cpp b/packages/kokkos/containers/unit_tests/cuda/TestCuda_DualView.cpp
index 730ef14b1..9d2f0f41b 100644
--- a/packages/kokkos/containers/unit_tests/cuda/TestCuda_DualView.cpp
+++ b/packages/kokkos/containers/unit_tests/cuda/TestCuda_DualView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_generic.cpp b/packages/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_generic.cpp
index 33665a647..f131914b0 100644
--- a/packages/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_generic.cpp
+++ b/packages/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_generic.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank12345.cpp b/packages/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank12345.cpp
index 06d9e697b..1c97d53de 100644
--- a/packages/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank12345.cpp
+++ b/packages/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank12345.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank67.cpp b/packages/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank67.cpp
index d9c003f39..e2aa2de55 100644
--- a/packages/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank67.cpp
+++ b/packages/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank67.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/cuda/TestCuda_DynamicView.cpp b/packages/kokkos/containers/unit_tests/cuda/TestCuda_DynamicView.cpp
index 736a04ecd..bfbdfabda 100644
--- a/packages/kokkos/containers/unit_tests/cuda/TestCuda_DynamicView.cpp
+++ b/packages/kokkos/containers/unit_tests/cuda/TestCuda_DynamicView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/cuda/TestCuda_ErrorReporter.cpp b/packages/kokkos/containers/unit_tests/cuda/TestCuda_ErrorReporter.cpp
index 1de25e2ac..1d5f1073e 100644
--- a/packages/kokkos/containers/unit_tests/cuda/TestCuda_ErrorReporter.cpp
+++ b/packages/kokkos/containers/unit_tests/cuda/TestCuda_ErrorReporter.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/cuda/TestCuda_OffsetView.cpp b/packages/kokkos/containers/unit_tests/cuda/TestCuda_OffsetView.cpp
index 31f27b54f..eab933c6d 100644
--- a/packages/kokkos/containers/unit_tests/cuda/TestCuda_OffsetView.cpp
+++ b/packages/kokkos/containers/unit_tests/cuda/TestCuda_OffsetView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/cuda/TestCuda_ScatterView.cpp b/packages/kokkos/containers/unit_tests/cuda/TestCuda_ScatterView.cpp
index a1a27b18d..85d0a443c 100644
--- a/packages/kokkos/containers/unit_tests/cuda/TestCuda_ScatterView.cpp
+++ b/packages/kokkos/containers/unit_tests/cuda/TestCuda_ScatterView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/cuda/TestCuda_StaticCrsGraph.cpp b/packages/kokkos/containers/unit_tests/cuda/TestCuda_StaticCrsGraph.cpp
index 67d953583..1b82c6230 100644
--- a/packages/kokkos/containers/unit_tests/cuda/TestCuda_StaticCrsGraph.cpp
+++ b/packages/kokkos/containers/unit_tests/cuda/TestCuda_StaticCrsGraph.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/cuda/TestCuda_UnorderedMap.cpp b/packages/kokkos/containers/unit_tests/cuda/TestCuda_UnorderedMap.cpp
index dccac405a..9c18e95d0 100644
--- a/packages/kokkos/containers/unit_tests/cuda/TestCuda_UnorderedMap.cpp
+++ b/packages/kokkos/containers/unit_tests/cuda/TestCuda_UnorderedMap.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/cuda/TestCuda_Vector.cpp b/packages/kokkos/containers/unit_tests/cuda/TestCuda_Vector.cpp
index 46e0647f8..d352f31ab 100644
--- a/packages/kokkos/containers/unit_tests/cuda/TestCuda_Vector.cpp
+++ b/packages/kokkos/containers/unit_tests/cuda/TestCuda_Vector.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/cuda/TestCuda_ViewCtorPropEmbeddedDim.cpp b/packages/kokkos/containers/unit_tests/cuda/TestCuda_ViewCtorPropEmbeddedDim.cpp
index 1a8f5b8c3..69a0f692b 100644
--- a/packages/kokkos/containers/unit_tests/cuda/TestCuda_ViewCtorPropEmbeddedDim.cpp
+++ b/packages/kokkos/containers/unit_tests/cuda/TestCuda_ViewCtorPropEmbeddedDim.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/hpx/TestHPX_BitSet.cpp b/packages/kokkos/containers/unit_tests/hpx/TestHPX_BitSet.cpp
index 125f7a923..3094f09df 100644
--- a/packages/kokkos/containers/unit_tests/hpx/TestHPX_BitSet.cpp
+++ b/packages/kokkos/containers/unit_tests/hpx/TestHPX_BitSet.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/hpx/TestHPX_Category.hpp b/packages/kokkos/containers/unit_tests/hpx/TestHPX_Category.hpp
index 7e6c4b92b..5f0446bb3 100644
--- a/packages/kokkos/containers/unit_tests/hpx/TestHPX_Category.hpp
+++ b/packages/kokkos/containers/unit_tests/hpx/TestHPX_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/hpx/TestHPX_DualView.cpp b/packages/kokkos/containers/unit_tests/hpx/TestHPX_DualView.cpp
index 1a939ff02..33180e9a0 100644
--- a/packages/kokkos/containers/unit_tests/hpx/TestHPX_DualView.cpp
+++ b/packages/kokkos/containers/unit_tests/hpx/TestHPX_DualView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_generic.cpp b/packages/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_generic.cpp
index df96b07e1..aa5e51038 100644
--- a/packages/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_generic.cpp
+++ b/packages/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_generic.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank12345.cpp b/packages/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank12345.cpp
index 294105701..1fa0d869a 100644
--- a/packages/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank12345.cpp
+++ b/packages/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank12345.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank67.cpp b/packages/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank67.cpp
index 7f6617eee..8384635a3 100644
--- a/packages/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank67.cpp
+++ b/packages/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank67.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/hpx/TestHPX_DynamicView.cpp b/packages/kokkos/containers/unit_tests/hpx/TestHPX_DynamicView.cpp
index 5c2af0c11..1c844f2d7 100644
--- a/packages/kokkos/containers/unit_tests/hpx/TestHPX_DynamicView.cpp
+++ b/packages/kokkos/containers/unit_tests/hpx/TestHPX_DynamicView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/hpx/TestHPX_ErrorReporter.cpp b/packages/kokkos/containers/unit_tests/hpx/TestHPX_ErrorReporter.cpp
index d96658c1a..03e85f381 100644
--- a/packages/kokkos/containers/unit_tests/hpx/TestHPX_ErrorReporter.cpp
+++ b/packages/kokkos/containers/unit_tests/hpx/TestHPX_ErrorReporter.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/hpx/TestHPX_OffsetView.cpp b/packages/kokkos/containers/unit_tests/hpx/TestHPX_OffsetView.cpp
index e14f46cc7..d7777d648 100644
--- a/packages/kokkos/containers/unit_tests/hpx/TestHPX_OffsetView.cpp
+++ b/packages/kokkos/containers/unit_tests/hpx/TestHPX_OffsetView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/hpx/TestHPX_ScatterView.cpp b/packages/kokkos/containers/unit_tests/hpx/TestHPX_ScatterView.cpp
index 9476a13a4..19e1fdbfb 100644
--- a/packages/kokkos/containers/unit_tests/hpx/TestHPX_ScatterView.cpp
+++ b/packages/kokkos/containers/unit_tests/hpx/TestHPX_ScatterView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/hpx/TestHPX_StaticCrsGraph.cpp b/packages/kokkos/containers/unit_tests/hpx/TestHPX_StaticCrsGraph.cpp
index 59c0f1285..0f3cc5f79 100644
--- a/packages/kokkos/containers/unit_tests/hpx/TestHPX_StaticCrsGraph.cpp
+++ b/packages/kokkos/containers/unit_tests/hpx/TestHPX_StaticCrsGraph.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/hpx/TestHPX_UnorderedMap.cpp b/packages/kokkos/containers/unit_tests/hpx/TestHPX_UnorderedMap.cpp
index 22789784b..63697c438 100644
--- a/packages/kokkos/containers/unit_tests/hpx/TestHPX_UnorderedMap.cpp
+++ b/packages/kokkos/containers/unit_tests/hpx/TestHPX_UnorderedMap.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/hpx/TestHPX_Vector.cpp b/packages/kokkos/containers/unit_tests/hpx/TestHPX_Vector.cpp
index 497821b69..896c9814b 100644
--- a/packages/kokkos/containers/unit_tests/hpx/TestHPX_Vector.cpp
+++ b/packages/kokkos/containers/unit_tests/hpx/TestHPX_Vector.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/hpx/TestHPX_ViewCtorPropEmbeddedDim.cpp b/packages/kokkos/containers/unit_tests/hpx/TestHPX_ViewCtorPropEmbeddedDim.cpp
index ed10afc23..d95e4a5e6 100644
--- a/packages/kokkos/containers/unit_tests/hpx/TestHPX_ViewCtorPropEmbeddedDim.cpp
+++ b/packages/kokkos/containers/unit_tests/hpx/TestHPX_ViewCtorPropEmbeddedDim.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_BitSet.cpp b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_BitSet.cpp
index dff14794d..6393a20fa 100644
--- a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_BitSet.cpp
+++ b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_BitSet.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_Category.hpp b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_Category.hpp
index 117bdc556..ef8a12b4f 100644
--- a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_Category.hpp
+++ b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DualView.cpp b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DualView.cpp
index ab041019d..a71cdc439 100644
--- a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DualView.cpp
+++ b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DualView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_generic.cpp b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_generic.cpp
index 56c66405d..3e0681c7a 100644
--- a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_generic.cpp
+++ b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_generic.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank12345.cpp b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank12345.cpp
index 64a18edbd..f64dee714 100644
--- a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank12345.cpp
+++ b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank12345.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank67.cpp b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank67.cpp
index ef9ecaf8e..3d0216bbc 100644
--- a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank67.cpp
+++ b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank67.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DynamicView.cpp b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DynamicView.cpp
index f27e1756f..6aac7285f 100644
--- a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DynamicView.cpp
+++ b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_DynamicView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_ErrorReporter.cpp b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_ErrorReporter.cpp
index 02ba9a2be..9f80d0cce 100644
--- a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_ErrorReporter.cpp
+++ b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_ErrorReporter.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_OffsetView.cpp b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_OffsetView.cpp
index 6a78f07ae..65bfeb15f 100644
--- a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_OffsetView.cpp
+++ b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_OffsetView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_ScatterView.cpp b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_ScatterView.cpp
index 02b44cfac..a362ac177 100644
--- a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_ScatterView.cpp
+++ b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_ScatterView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_StaticCrsGraph.cpp b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_StaticCrsGraph.cpp
index c53168daf..aefa214e6 100644
--- a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_StaticCrsGraph.cpp
+++ b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_StaticCrsGraph.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_UnorderedMap.cpp b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_UnorderedMap.cpp
index 765e5bd98..f88585fb9 100644
--- a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_UnorderedMap.cpp
+++ b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_UnorderedMap.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_Vector.cpp b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_Vector.cpp
index 08dec5ec5..2e4c84990 100644
--- a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_Vector.cpp
+++ b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_Vector.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_ViewCtorPropEmbeddedDim.cpp b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_ViewCtorPropEmbeddedDim.cpp
index 16fbd71d9..5878ea138 100644
--- a/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_ViewCtorPropEmbeddedDim.cpp
+++ b/packages/kokkos/containers/unit_tests/openmp/TestOpenMP_ViewCtorPropEmbeddedDim.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/rocm/TestROCm_BitSet.cpp b/packages/kokkos/containers/unit_tests/rocm/TestROCm_BitSet.cpp
index aa4b1b38f..9a886afcf 100644
--- a/packages/kokkos/containers/unit_tests/rocm/TestROCm_BitSet.cpp
+++ b/packages/kokkos/containers/unit_tests/rocm/TestROCm_BitSet.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/rocm/TestROCm_Category.hpp b/packages/kokkos/containers/unit_tests/rocm/TestROCm_Category.hpp
index 800ba87d5..2db3ed633 100644
--- a/packages/kokkos/containers/unit_tests/rocm/TestROCm_Category.hpp
+++ b/packages/kokkos/containers/unit_tests/rocm/TestROCm_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/rocm/TestROCm_DualView.cpp b/packages/kokkos/containers/unit_tests/rocm/TestROCm_DualView.cpp
index f3f09905b..5eb67a8d1 100644
--- a/packages/kokkos/containers/unit_tests/rocm/TestROCm_DualView.cpp
+++ b/packages/kokkos/containers/unit_tests/rocm/TestROCm_DualView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_generic.cpp b/packages/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_generic.cpp
index 988d33190..a061748bb 100644
--- a/packages/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_generic.cpp
+++ b/packages/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_generic.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank12345.cpp b/packages/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank12345.cpp
index 64816baa7..d459bc118 100644
--- a/packages/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank12345.cpp
+++ b/packages/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank12345.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank67.cpp b/packages/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank67.cpp
index 43fe3ea94..3013da60b 100644
--- a/packages/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank67.cpp
+++ b/packages/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank67.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/rocm/TestROCm_DynamicView.cpp b/packages/kokkos/containers/unit_tests/rocm/TestROCm_DynamicView.cpp
index c605bc55a..4b847a5ba 100644
--- a/packages/kokkos/containers/unit_tests/rocm/TestROCm_DynamicView.cpp
+++ b/packages/kokkos/containers/unit_tests/rocm/TestROCm_DynamicView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/rocm/TestROCm_ErrorReporter.cpp b/packages/kokkos/containers/unit_tests/rocm/TestROCm_ErrorReporter.cpp
index edf7ca69f..410e1782e 100644
--- a/packages/kokkos/containers/unit_tests/rocm/TestROCm_ErrorReporter.cpp
+++ b/packages/kokkos/containers/unit_tests/rocm/TestROCm_ErrorReporter.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/rocm/TestROCm_ScatterView.cpp b/packages/kokkos/containers/unit_tests/rocm/TestROCm_ScatterView.cpp
index 9bd8a2302..5598cb9fa 100644
--- a/packages/kokkos/containers/unit_tests/rocm/TestROCm_ScatterView.cpp
+++ b/packages/kokkos/containers/unit_tests/rocm/TestROCm_ScatterView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/rocm/TestROCm_StaticCrsGraph.cpp b/packages/kokkos/containers/unit_tests/rocm/TestROCm_StaticCrsGraph.cpp
index 251d5968e..b8d3e0abe 100644
--- a/packages/kokkos/containers/unit_tests/rocm/TestROCm_StaticCrsGraph.cpp
+++ b/packages/kokkos/containers/unit_tests/rocm/TestROCm_StaticCrsGraph.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/rocm/TestROCm_UnorderedMap.cpp b/packages/kokkos/containers/unit_tests/rocm/TestROCm_UnorderedMap.cpp
index e24904fc4..8680c9d0f 100644
--- a/packages/kokkos/containers/unit_tests/rocm/TestROCm_UnorderedMap.cpp
+++ b/packages/kokkos/containers/unit_tests/rocm/TestROCm_UnorderedMap.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/rocm/TestROCm_Vector.cpp b/packages/kokkos/containers/unit_tests/rocm/TestROCm_Vector.cpp
index 2e4a5dd1c..81e2c2779 100644
--- a/packages/kokkos/containers/unit_tests/rocm/TestROCm_Vector.cpp
+++ b/packages/kokkos/containers/unit_tests/rocm/TestROCm_Vector.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/rocm/TestROCm_ViewCtorPropEmbeddedDim.cpp b/packages/kokkos/containers/unit_tests/rocm/TestROCm_ViewCtorPropEmbeddedDim.cpp
index 6f91ccaa7..58b00dc2f 100644
--- a/packages/kokkos/containers/unit_tests/rocm/TestROCm_ViewCtorPropEmbeddedDim.cpp
+++ b/packages/kokkos/containers/unit_tests/rocm/TestROCm_ViewCtorPropEmbeddedDim.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/serial/TestSerial_BitSet.cpp b/packages/kokkos/containers/unit_tests/serial/TestSerial_BitSet.cpp
index 78a67818b..435b75e37 100644
--- a/packages/kokkos/containers/unit_tests/serial/TestSerial_BitSet.cpp
+++ b/packages/kokkos/containers/unit_tests/serial/TestSerial_BitSet.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/serial/TestSerial_Category.hpp b/packages/kokkos/containers/unit_tests/serial/TestSerial_Category.hpp
index 19ff375ff..3ad66b084 100644
--- a/packages/kokkos/containers/unit_tests/serial/TestSerial_Category.hpp
+++ b/packages/kokkos/containers/unit_tests/serial/TestSerial_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/serial/TestSerial_DualView.cpp b/packages/kokkos/containers/unit_tests/serial/TestSerial_DualView.cpp
index 94853ce3d..a27548795 100644
--- a/packages/kokkos/containers/unit_tests/serial/TestSerial_DualView.cpp
+++ b/packages/kokkos/containers/unit_tests/serial/TestSerial_DualView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_generic.cpp b/packages/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_generic.cpp
index 05faa1b08..0f36be1f6 100644
--- a/packages/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_generic.cpp
+++ b/packages/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_generic.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank12345.cpp b/packages/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank12345.cpp
index dc05c92f9..2b038b83a 100644
--- a/packages/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank12345.cpp
+++ b/packages/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank12345.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank67.cpp b/packages/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank67.cpp
index cf41ec044..655d4f1c8 100644
--- a/packages/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank67.cpp
+++ b/packages/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank67.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/serial/TestSerial_DynamicView.cpp b/packages/kokkos/containers/unit_tests/serial/TestSerial_DynamicView.cpp
index b367877d6..56db2adf7 100644
--- a/packages/kokkos/containers/unit_tests/serial/TestSerial_DynamicView.cpp
+++ b/packages/kokkos/containers/unit_tests/serial/TestSerial_DynamicView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/serial/TestSerial_ErrorReporter.cpp b/packages/kokkos/containers/unit_tests/serial/TestSerial_ErrorReporter.cpp
index 8f254ae5b..3d1f51ccc 100644
--- a/packages/kokkos/containers/unit_tests/serial/TestSerial_ErrorReporter.cpp
+++ b/packages/kokkos/containers/unit_tests/serial/TestSerial_ErrorReporter.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/serial/TestSerial_OffsetView.cpp b/packages/kokkos/containers/unit_tests/serial/TestSerial_OffsetView.cpp
index dc67ba7ce..a92175e61 100644
--- a/packages/kokkos/containers/unit_tests/serial/TestSerial_OffsetView.cpp
+++ b/packages/kokkos/containers/unit_tests/serial/TestSerial_OffsetView.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/serial/TestSerial_ScatterView.cpp b/packages/kokkos/containers/unit_tests/serial/TestSerial_ScatterView.cpp
index c89bb7499..2d4d2f76d 100644
--- a/packages/kokkos/containers/unit_tests/serial/TestSerial_ScatterView.cpp
+++ b/packages/kokkos/containers/unit_tests/serial/TestSerial_ScatterView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/serial/TestSerial_StaticCrsGraph.cpp b/packages/kokkos/containers/unit_tests/serial/TestSerial_StaticCrsGraph.cpp
index 9001b3ac5..0b3ffe047 100644
--- a/packages/kokkos/containers/unit_tests/serial/TestSerial_StaticCrsGraph.cpp
+++ b/packages/kokkos/containers/unit_tests/serial/TestSerial_StaticCrsGraph.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/serial/TestSerial_UnorderedMap.cpp b/packages/kokkos/containers/unit_tests/serial/TestSerial_UnorderedMap.cpp
index 59fc64bbc..652b7573e 100644
--- a/packages/kokkos/containers/unit_tests/serial/TestSerial_UnorderedMap.cpp
+++ b/packages/kokkos/containers/unit_tests/serial/TestSerial_UnorderedMap.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/serial/TestSerial_Vector.cpp b/packages/kokkos/containers/unit_tests/serial/TestSerial_Vector.cpp
index b6e315c7c..7f54968f8 100644
--- a/packages/kokkos/containers/unit_tests/serial/TestSerial_Vector.cpp
+++ b/packages/kokkos/containers/unit_tests/serial/TestSerial_Vector.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/serial/TestSerial_ViewCtorPropEmbeddedDim.cpp b/packages/kokkos/containers/unit_tests/serial/TestSerial_ViewCtorPropEmbeddedDim.cpp
index 60ded46c3..6532e3949 100644
--- a/packages/kokkos/containers/unit_tests/serial/TestSerial_ViewCtorPropEmbeddedDim.cpp
+++ b/packages/kokkos/containers/unit_tests/serial/TestSerial_ViewCtorPropEmbeddedDim.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/threads/TestThreads_BitSet.cpp b/packages/kokkos/containers/unit_tests/threads/TestThreads_BitSet.cpp
index 2519a5aa6..8611cf8c2 100644
--- a/packages/kokkos/containers/unit_tests/threads/TestThreads_BitSet.cpp
+++ b/packages/kokkos/containers/unit_tests/threads/TestThreads_BitSet.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/threads/TestThreads_Category.hpp b/packages/kokkos/containers/unit_tests/threads/TestThreads_Category.hpp
index 8313a146f..5c37163bc 100644
--- a/packages/kokkos/containers/unit_tests/threads/TestThreads_Category.hpp
+++ b/packages/kokkos/containers/unit_tests/threads/TestThreads_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/threads/TestThreads_DualView.cpp b/packages/kokkos/containers/unit_tests/threads/TestThreads_DualView.cpp
index fb40e8721..67b31d038 100644
--- a/packages/kokkos/containers/unit_tests/threads/TestThreads_DualView.cpp
+++ b/packages/kokkos/containers/unit_tests/threads/TestThreads_DualView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_generic.cpp b/packages/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_generic.cpp
index 48011e13f..cddb7ae4f 100644
--- a/packages/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_generic.cpp
+++ b/packages/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_generic.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank12345.cpp b/packages/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank12345.cpp
index ec96224f9..b5645d682 100644
--- a/packages/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank12345.cpp
+++ b/packages/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank12345.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank67.cpp b/packages/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank67.cpp
index f102b217e..f1784f4a5 100644
--- a/packages/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank67.cpp
+++ b/packages/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank67.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/threads/TestThreads_DynamicView.cpp b/packages/kokkos/containers/unit_tests/threads/TestThreads_DynamicView.cpp
index 34b4ae00d..273ced7bd 100644
--- a/packages/kokkos/containers/unit_tests/threads/TestThreads_DynamicView.cpp
+++ b/packages/kokkos/containers/unit_tests/threads/TestThreads_DynamicView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/threads/TestThreads_ErrorReporter.cpp b/packages/kokkos/containers/unit_tests/threads/TestThreads_ErrorReporter.cpp
index 8260a2f88..3f39959ba 100644
--- a/packages/kokkos/containers/unit_tests/threads/TestThreads_ErrorReporter.cpp
+++ b/packages/kokkos/containers/unit_tests/threads/TestThreads_ErrorReporter.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/threads/TestThreads_OffsetView.cpp b/packages/kokkos/containers/unit_tests/threads/TestThreads_OffsetView.cpp
index b0796b56b..c5734fd86 100644
--- a/packages/kokkos/containers/unit_tests/threads/TestThreads_OffsetView.cpp
+++ b/packages/kokkos/containers/unit_tests/threads/TestThreads_OffsetView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/threads/TestThreads_ScatterView.cpp b/packages/kokkos/containers/unit_tests/threads/TestThreads_ScatterView.cpp
index 22a43d7b4..f8bda09cb 100644
--- a/packages/kokkos/containers/unit_tests/threads/TestThreads_ScatterView.cpp
+++ b/packages/kokkos/containers/unit_tests/threads/TestThreads_ScatterView.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/threads/TestThreads_StaticCrsGraph.cpp b/packages/kokkos/containers/unit_tests/threads/TestThreads_StaticCrsGraph.cpp
index 9e542467b..38cba9753 100644
--- a/packages/kokkos/containers/unit_tests/threads/TestThreads_StaticCrsGraph.cpp
+++ b/packages/kokkos/containers/unit_tests/threads/TestThreads_StaticCrsGraph.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/threads/TestThreads_UnorderedMap.cpp b/packages/kokkos/containers/unit_tests/threads/TestThreads_UnorderedMap.cpp
index 80abff747..dbfcf0dc3 100644
--- a/packages/kokkos/containers/unit_tests/threads/TestThreads_UnorderedMap.cpp
+++ b/packages/kokkos/containers/unit_tests/threads/TestThreads_UnorderedMap.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/threads/TestThreads_Vector.cpp b/packages/kokkos/containers/unit_tests/threads/TestThreads_Vector.cpp
index bcd033545..f470f0c99 100644
--- a/packages/kokkos/containers/unit_tests/threads/TestThreads_Vector.cpp
+++ b/packages/kokkos/containers/unit_tests/threads/TestThreads_Vector.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/containers/unit_tests/threads/TestThreads_ViewCtorPropEmbeddedDim.cpp b/packages/kokkos/containers/unit_tests/threads/TestThreads_ViewCtorPropEmbeddedDim.cpp
index 2469d7e2b..17e1465cf 100644
--- a/packages/kokkos/containers/unit_tests/threads/TestThreads_ViewCtorPropEmbeddedDim.cpp
+++ b/packages/kokkos/containers/unit_tests/threads/TestThreads_ViewCtorPropEmbeddedDim.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTestBlasKernels.hpp b/packages/kokkos/core/perf_test/PerfTestBlasKernels.hpp
index e35ccf894..4704a5feb 100644
--- a/packages/kokkos/core/perf_test/PerfTestBlasKernels.hpp
+++ b/packages/kokkos/core/perf_test/PerfTestBlasKernels.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTestDriver.hpp b/packages/kokkos/core/perf_test/PerfTestDriver.hpp
index 38387ca6a..b7b49c000 100644
--- a/packages/kokkos/core/perf_test/PerfTestDriver.hpp
+++ b/packages/kokkos/core/perf_test/PerfTestDriver.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTestGramSchmidt.cpp b/packages/kokkos/core/perf_test/PerfTestGramSchmidt.cpp
index 2e231f494..787c5e807 100644
--- a/packages/kokkos/core/perf_test/PerfTestGramSchmidt.cpp
+++ b/packages/kokkos/core/perf_test/PerfTestGramSchmidt.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTestHexGrad.cpp b/packages/kokkos/core/perf_test/PerfTestHexGrad.cpp
index a0c54cd8d..4c3c9fd52 100644
--- a/packages/kokkos/core/perf_test/PerfTestHexGrad.cpp
+++ b/packages/kokkos/core/perf_test/PerfTestHexGrad.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTestMDRange.hpp b/packages/kokkos/core/perf_test/PerfTestMDRange.hpp
index c10842261..00123fbfd 100644
--- a/packages/kokkos/core/perf_test/PerfTestMDRange.hpp
+++ b/packages/kokkos/core/perf_test/PerfTestMDRange.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTestMain.cpp b/packages/kokkos/core/perf_test/PerfTestMain.cpp
index e7a2c75b4..7a258623e 100644
--- a/packages/kokkos/core/perf_test/PerfTestMain.cpp
+++ b/packages/kokkos/core/perf_test/PerfTestMain.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_Category.hpp b/packages/kokkos/core/perf_test/PerfTest_Category.hpp
index e40807762..ce5d99eb7 100644
--- a/packages/kokkos/core/perf_test/PerfTest_Category.hpp
+++ b/packages/kokkos/core/perf_test/PerfTest_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_CustomReduction.cpp b/packages/kokkos/core/perf_test/PerfTest_CustomReduction.cpp
index dac74cc2b..7447eb6e7 100644
--- a/packages/kokkos/core/perf_test/PerfTest_CustomReduction.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_CustomReduction.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewAllocate.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewAllocate.cpp
index ade2376b5..b71dce878 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewAllocate.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewAllocate.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy.hpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy.hpp
index 9d78f3bd3..ded941107 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy.hpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a123.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a123.cpp
index c1f8028a1..ae0966969 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a123.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a123.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a45.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a45.cpp
index d9189cc82..d7711f190 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a45.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a45.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a6.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a6.cpp
index d81c55232..4888d0d7c 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a6.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a6.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a7.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a7.cpp
index 6a6a70ecd..2aaaf075e 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a7.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a7.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a8.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a8.cpp
index 24193d777..9f5f2a91a 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a8.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_a8.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b123.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b123.cpp
index b451ed016..33d6570d2 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b123.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b123.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b45.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b45.cpp
index cea53a868..b20915e91 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b45.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b45.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b6.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b6.cpp
index 11f386a75..98b8f0f13 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b6.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b6.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b7.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b7.cpp
index 5909b0a6e..1d7a47cad 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b7.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b7.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b8.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b8.cpp
index ca7c3a1e5..869828ab3 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b8.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_b8.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c123.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c123.cpp
index 7a3d16308..d2ffb9bc8 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c123.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c123.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c45.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c45.cpp
index 7fe10483c..9d28f60ba 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c45.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c45.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c6.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c6.cpp
index 7e6df0278..24ac4a53d 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c6.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c6.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c7.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c7.cpp
index 2d2a65e02..f4809bade 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c7.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c7.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c8.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c8.cpp
index 6d0d7c074..0955ebfb8 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c8.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_c8.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d123.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d123.cpp
index d15a84508..ed220d51b 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d123.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d123.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d45.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d45.cpp
index 2d210eb52..e937ad5e2 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d45.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d45.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d6.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d6.cpp
index b57383dd5..08f12d2de 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d6.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d6.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d7.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d7.cpp
index d2cea75f4..d5a6f3931 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d7.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d7.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d8.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d8.cpp
index 7d7a3d4cf..4015686e6 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d8.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewCopy_d8.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewFill.hpp b/packages/kokkos/core/perf_test/PerfTest_ViewFill.hpp
index a85d66b39..b1b7350c4 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewFill.hpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewFill.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewFill_123.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewFill_123.cpp
index 1608b5738..448410cf8 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewFill_123.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewFill_123.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewFill_45.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewFill_45.cpp
index dddf8bfa2..6893f6830 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewFill_45.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewFill_45.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewFill_6.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewFill_6.cpp
index 44b0a37b5..299790b31 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewFill_6.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewFill_6.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewFill_7.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewFill_7.cpp
index d4c3e35b4..825ffb3fa 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewFill_7.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewFill_7.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewFill_8.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewFill_8.cpp
index f96581815..199581d0f 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewFill_8.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewFill_8.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewResize.hpp b/packages/kokkos/core/perf_test/PerfTest_ViewResize.hpp
index a0a85373b..e38c69593 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewResize.hpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewResize.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewResize_123.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewResize_123.cpp
index 2610b3f91..993ad3eda 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewResize_123.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewResize_123.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewResize_45.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewResize_45.cpp
index 5a3a68c3c..feaecf51d 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewResize_45.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewResize_45.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewResize_6.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewResize_6.cpp
index d96e5a297..d3d1585c1 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewResize_6.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewResize_6.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewResize_7.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewResize_7.cpp
index 54f0eed0e..021c7fa07 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewResize_7.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewResize_7.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/PerfTest_ViewResize_8.cpp b/packages/kokkos/core/perf_test/PerfTest_ViewResize_8.cpp
index 7681c36d8..60ca0d618 100644
--- a/packages/kokkos/core/perf_test/PerfTest_ViewResize_8.cpp
+++ b/packages/kokkos/core/perf_test/PerfTest_ViewResize_8.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/test_atomic.cpp b/packages/kokkos/core/perf_test/test_atomic.cpp
index a3b727872..df4e1a0b2 100644
--- a/packages/kokkos/core/perf_test/test_atomic.cpp
+++ b/packages/kokkos/core/perf_test/test_atomic.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/test_mempool.cpp b/packages/kokkos/core/perf_test/test_mempool.cpp
index d852e124f..1186cf1bb 100644
--- a/packages/kokkos/core/perf_test/test_mempool.cpp
+++ b/packages/kokkos/core/perf_test/test_mempool.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/perf_test/test_taskdag.cpp b/packages/kokkos/core/perf_test/test_taskdag.cpp
index d1c3fc6b0..b0dcb0531 100644
--- a/packages/kokkos/core/perf_test/test_taskdag.cpp
+++ b/packages/kokkos/core/perf_test/test_taskdag.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile.hpp b/packages/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile.hpp
index 996355e77..3cb5a8019 100644
--- a/packages/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile.hpp
+++ b/packages/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile_Refactor.hpp b/packages/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile_Refactor.hpp
index bd11be99e..37a304a03 100644
--- a/packages/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile_Refactor.hpp
+++ b/packages/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile_Refactor.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_CudaSpace.cpp b/packages/kokkos/core/src/Cuda/Kokkos_CudaSpace.cpp
index 5e2fca094..9dd1ccfd8 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_CudaSpace.cpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_CudaSpace.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Alloc.hpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Alloc.hpp
index b4b0c9928..b2f55e315 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Alloc.hpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Alloc.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics.hpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics.hpp
index 5da4e1569..6badf2b19 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics.hpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics.hpp
@@ -32,10 +32,10 @@ LICENSE ASSOCIATED WITH SUBSEQUENT MODIFICATIONS
// ************************************************************************
//
-// Kokkos v. 2.0
+// Kokkos v. 3.0
// Copyright (2019) Sandia Corporation
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics_Restore_Builtins.hpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics_Restore_Builtins.hpp
index c6e6845b7..fe61ddbd3 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics_Restore_Builtins.hpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics_Restore_Builtins.hpp
@@ -2,10 +2,10 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
+// Kokkos v. 3.0
// Copyright (2019) Sandia Corporation
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_BlockSize_Deduction.hpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_BlockSize_Deduction.hpp
index b5b20a44c..c1cdf0066 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_BlockSize_Deduction.hpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_BlockSize_Deduction.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Error.hpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Error.hpp
index ce2d7350b..e498decba 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Error.hpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Error.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.cpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.cpp
index 72458388c..359310e59 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.cpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_KernelLaunch.hpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_KernelLaunch.hpp
index 29935c1c4..292832e15 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_KernelLaunch.hpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_KernelLaunch.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.cpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.cpp
index 4d2909574..41fc522b5 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.cpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.hpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.hpp
index 93a633fa8..8baf295ef 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.hpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Parallel.hpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Parallel.hpp
index 97b98d173..a3469ef4a 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Parallel.hpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Parallel.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_ReduceScan.hpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_ReduceScan.hpp
index 967a2acc3..04ad33e55 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_ReduceScan.hpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_ReduceScan.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Task.cpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Task.cpp
index db587ca3b..1dbaeca4d 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Task.cpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Task.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Task.hpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Task.hpp
index d607f3752..26d874a1e 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Task.hpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Task.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Team.hpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Team.hpp
index ff403489d..4747052ca 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Team.hpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Team.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_UniqueToken.hpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_UniqueToken.hpp
index d434023b6..9649d4cec 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_UniqueToken.hpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_UniqueToken.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Vectorization.hpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Vectorization.hpp
index 4080ceca1..c07597f98 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Vectorization.hpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_Vectorization.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp
index e134a152e..9521c732c 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIAvail.hpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIAvail.hpp
index 6fbb5c57b..8722c64df 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIAvail.hpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIAvail.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIDecl.hpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIDecl.hpp
index ea85bd1ed..cddc0b1ad 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIDecl.hpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIDecl.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_WorkGraphPolicy.hpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_WorkGraphPolicy.hpp
index df6e8eeb3..eb9d55c47 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_WorkGraphPolicy.hpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_WorkGraphPolicy.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_abort.hpp b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_abort.hpp
index 8a2712d12..7e9f38c82 100644
--- a/packages/kokkos/core/src/Cuda/Kokkos_Cuda_abort.hpp
+++ b/packages/kokkos/core/src/Cuda/Kokkos_Cuda_abort.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/HPX/Kokkos_HPX.cpp b/packages/kokkos/core/src/HPX/Kokkos_HPX.cpp
index 5cf145855..6d7867a06 100644
--- a/packages/kokkos/core/src/HPX/Kokkos_HPX.cpp
+++ b/packages/kokkos/core/src/HPX/Kokkos_HPX.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/HPX/Kokkos_HPX_ChunkedRoundRobinExecutor.hpp b/packages/kokkos/core/src/HPX/Kokkos_HPX_ChunkedRoundRobinExecutor.hpp
index e60d7435e..456dd4791 100644
--- a/packages/kokkos/core/src/HPX/Kokkos_HPX_ChunkedRoundRobinExecutor.hpp
+++ b/packages/kokkos/core/src/HPX/Kokkos_HPX_ChunkedRoundRobinExecutor.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/HPX/Kokkos_HPX_Task.cpp b/packages/kokkos/core/src/HPX/Kokkos_HPX_Task.cpp
index 7c61ab971..b4c6cd9fb 100644
--- a/packages/kokkos/core/src/HPX/Kokkos_HPX_Task.cpp
+++ b/packages/kokkos/core/src/HPX/Kokkos_HPX_Task.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/HPX/Kokkos_HPX_Task.hpp b/packages/kokkos/core/src/HPX/Kokkos_HPX_Task.hpp
index d18c66bd3..a08825738 100644
--- a/packages/kokkos/core/src/HPX/Kokkos_HPX_Task.hpp
+++ b/packages/kokkos/core/src/HPX/Kokkos_HPX_Task.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIAvail.hpp b/packages/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIAvail.hpp
index 706d49700..ea5cf5602 100644
--- a/packages/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIAvail.hpp
+++ b/packages/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIAvail.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIDecl.hpp b/packages/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIDecl.hpp
index 68c35154e..a119322a4 100644
--- a/packages/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIDecl.hpp
+++ b/packages/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIDecl.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/HPX/Kokkos_HPX_WorkGraphPolicy.hpp b/packages/kokkos/core/src/HPX/Kokkos_HPX_WorkGraphPolicy.hpp
index b57a16bda..c828c5320 100644
--- a/packages/kokkos/core/src/HPX/Kokkos_HPX_WorkGraphPolicy.hpp
+++ b/packages/kokkos/core/src/HPX/Kokkos_HPX_WorkGraphPolicy.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/KokkosExp_MDRangePolicy.hpp b/packages/kokkos/core/src/KokkosExp_MDRangePolicy.hpp
index 5d2a41297..9af8e5481 100644
--- a/packages/kokkos/core/src/KokkosExp_MDRangePolicy.hpp
+++ b/packages/kokkos/core/src/KokkosExp_MDRangePolicy.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_AnonymousSpace.hpp b/packages/kokkos/core/src/Kokkos_AnonymousSpace.hpp
index da74ac905..02d8ef8ba 100644
--- a/packages/kokkos/core/src/Kokkos_AnonymousSpace.hpp
+++ b/packages/kokkos/core/src/Kokkos_AnonymousSpace.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Array.hpp b/packages/kokkos/core/src/Kokkos_Array.hpp
index 8ad2fda6a..725a64427 100644
--- a/packages/kokkos/core/src/Kokkos_Array.hpp
+++ b/packages/kokkos/core/src/Kokkos_Array.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Atomic.hpp b/packages/kokkos/core/src/Kokkos_Atomic.hpp
index 6eb9e75fd..2f065cd2c 100644
--- a/packages/kokkos/core/src/Kokkos_Atomic.hpp
+++ b/packages/kokkos/core/src/Kokkos_Atomic.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Complex.hpp b/packages/kokkos/core/src/Kokkos_Complex.hpp
index a7640a052..dbe2fd988 100644
--- a/packages/kokkos/core/src/Kokkos_Complex.hpp
+++ b/packages/kokkos/core/src/Kokkos_Complex.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Concepts.hpp b/packages/kokkos/core/src/Kokkos_Concepts.hpp
index 164d90950..f81705297 100644
--- a/packages/kokkos/core/src/Kokkos_Concepts.hpp
+++ b/packages/kokkos/core/src/Kokkos_Concepts.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_CopyViews.hpp b/packages/kokkos/core/src/Kokkos_CopyViews.hpp
index df46e6c92..327cb666c 100644
--- a/packages/kokkos/core/src/Kokkos_CopyViews.hpp
+++ b/packages/kokkos/core/src/Kokkos_CopyViews.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Core.hpp b/packages/kokkos/core/src/Kokkos_Core.hpp
index 1920a08a4..7caffd37d 100644
--- a/packages/kokkos/core/src/Kokkos_Core.hpp
+++ b/packages/kokkos/core/src/Kokkos_Core.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Core_fwd.hpp b/packages/kokkos/core/src/Kokkos_Core_fwd.hpp
index 3f3b207d6..a904a8173 100644
--- a/packages/kokkos/core/src/Kokkos_Core_fwd.hpp
+++ b/packages/kokkos/core/src/Kokkos_Core_fwd.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Crs.hpp b/packages/kokkos/core/src/Kokkos_Crs.hpp
index c0d8f6cab..4b209d819 100644
--- a/packages/kokkos/core/src/Kokkos_Crs.hpp
+++ b/packages/kokkos/core/src/Kokkos_Crs.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Cuda.hpp b/packages/kokkos/core/src/Kokkos_Cuda.hpp
index 2831032e7..b1e565471 100644
--- a/packages/kokkos/core/src/Kokkos_Cuda.hpp
+++ b/packages/kokkos/core/src/Kokkos_Cuda.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_CudaSpace.hpp b/packages/kokkos/core/src/Kokkos_CudaSpace.hpp
index 376bfa92f..42e5bd53d 100644
--- a/packages/kokkos/core/src/Kokkos_CudaSpace.hpp
+++ b/packages/kokkos/core/src/Kokkos_CudaSpace.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_ExecPolicy.hpp b/packages/kokkos/core/src/Kokkos_ExecPolicy.hpp
index c03268550..d52c2612e 100644
--- a/packages/kokkos/core/src/Kokkos_ExecPolicy.hpp
+++ b/packages/kokkos/core/src/Kokkos_ExecPolicy.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Extents.hpp b/packages/kokkos/core/src/Kokkos_Extents.hpp
index 65a9c8fcc..a972993fb 100644
--- a/packages/kokkos/core/src/Kokkos_Extents.hpp
+++ b/packages/kokkos/core/src/Kokkos_Extents.hpp
@@ -2,10 +2,10 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
+// Kokkos v. 3.0
// Copyright (2019) Sandia Corporation
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Future.hpp b/packages/kokkos/core/src/Kokkos_Future.hpp
index 30bf955ff..8ed901b37 100644
--- a/packages/kokkos/core/src/Kokkos_Future.hpp
+++ b/packages/kokkos/core/src/Kokkos_Future.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_HBWSpace.hpp b/packages/kokkos/core/src/Kokkos_HBWSpace.hpp
index 7f2d60495..5ea3c5622 100644
--- a/packages/kokkos/core/src/Kokkos_HBWSpace.hpp
+++ b/packages/kokkos/core/src/Kokkos_HBWSpace.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_HPX.hpp b/packages/kokkos/core/src/Kokkos_HPX.hpp
index 2c8271688..5400bad84 100644
--- a/packages/kokkos/core/src/Kokkos_HPX.hpp
+++ b/packages/kokkos/core/src/Kokkos_HPX.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_HostSpace.hpp b/packages/kokkos/core/src/Kokkos_HostSpace.hpp
index 4c1537f0a..f5815baec 100644
--- a/packages/kokkos/core/src/Kokkos_HostSpace.hpp
+++ b/packages/kokkos/core/src/Kokkos_HostSpace.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Layout.hpp b/packages/kokkos/core/src/Kokkos_Layout.hpp
index ff676ea32..7f6e68a07 100644
--- a/packages/kokkos/core/src/Kokkos_Layout.hpp
+++ b/packages/kokkos/core/src/Kokkos_Layout.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Macros.hpp b/packages/kokkos/core/src/Kokkos_Macros.hpp
index 79f219489..2581bce30 100644
--- a/packages/kokkos/core/src/Kokkos_Macros.hpp
+++ b/packages/kokkos/core/src/Kokkos_Macros.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_MasterLock.hpp b/packages/kokkos/core/src/Kokkos_MasterLock.hpp
index b79a0fdc0..77d776981 100644
--- a/packages/kokkos/core/src/Kokkos_MasterLock.hpp
+++ b/packages/kokkos/core/src/Kokkos_MasterLock.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_MemoryPool.hpp b/packages/kokkos/core/src/Kokkos_MemoryPool.hpp
index 1b5502997..f38e12a1c 100644
--- a/packages/kokkos/core/src/Kokkos_MemoryPool.hpp
+++ b/packages/kokkos/core/src/Kokkos_MemoryPool.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_MemoryTraits.hpp b/packages/kokkos/core/src/Kokkos_MemoryTraits.hpp
index 0fe4f81cf..b0de42d4c 100644
--- a/packages/kokkos/core/src/Kokkos_MemoryTraits.hpp
+++ b/packages/kokkos/core/src/Kokkos_MemoryTraits.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_NumericTraits.hpp b/packages/kokkos/core/src/Kokkos_NumericTraits.hpp
index 5116428ef..aaa900b52 100644
--- a/packages/kokkos/core/src/Kokkos_NumericTraits.hpp
+++ b/packages/kokkos/core/src/Kokkos_NumericTraits.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_OpenMP.hpp b/packages/kokkos/core/src/Kokkos_OpenMP.hpp
index 8a5f6d3df..5ced2a067 100644
--- a/packages/kokkos/core/src/Kokkos_OpenMP.hpp
+++ b/packages/kokkos/core/src/Kokkos_OpenMP.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_OpenMPTarget.hpp b/packages/kokkos/core/src/Kokkos_OpenMPTarget.hpp
index f4b4653d1..c17cfa0a0 100644
--- a/packages/kokkos/core/src/Kokkos_OpenMPTarget.hpp
+++ b/packages/kokkos/core/src/Kokkos_OpenMPTarget.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_OpenMPTargetSpace.hpp b/packages/kokkos/core/src/Kokkos_OpenMPTargetSpace.hpp
index 48e316cd9..bb698c07f 100644
--- a/packages/kokkos/core/src/Kokkos_OpenMPTargetSpace.hpp
+++ b/packages/kokkos/core/src/Kokkos_OpenMPTargetSpace.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Pair.hpp b/packages/kokkos/core/src/Kokkos_Pair.hpp
index 757a18805..87bda4e41 100644
--- a/packages/kokkos/core/src/Kokkos_Pair.hpp
+++ b/packages/kokkos/core/src/Kokkos_Pair.hpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Parallel.hpp b/packages/kokkos/core/src/Kokkos_Parallel.hpp
index fe72387fb..c3c0b2b5c 100644
--- a/packages/kokkos/core/src/Kokkos_Parallel.hpp
+++ b/packages/kokkos/core/src/Kokkos_Parallel.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Parallel_Reduce.hpp b/packages/kokkos/core/src/Kokkos_Parallel_Reduce.hpp
index 932016871..3df8d56de 100644
--- a/packages/kokkos/core/src/Kokkos_Parallel_Reduce.hpp
+++ b/packages/kokkos/core/src/Kokkos_Parallel_Reduce.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_PointerOwnership.hpp b/packages/kokkos/core/src/Kokkos_PointerOwnership.hpp
index 765e99b17..19dad77ef 100644
--- a/packages/kokkos/core/src/Kokkos_PointerOwnership.hpp
+++ b/packages/kokkos/core/src/Kokkos_PointerOwnership.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Profiling_ProfileSection.hpp b/packages/kokkos/core/src/Kokkos_Profiling_ProfileSection.hpp
index 77648c68e..ac0e6b0ea 100644
--- a/packages/kokkos/core/src/Kokkos_Profiling_ProfileSection.hpp
+++ b/packages/kokkos/core/src/Kokkos_Profiling_ProfileSection.hpp
@@ -1,45 +1,46 @@
/*
- //@HEADER
- // ************************************************************************
- //
- // Kokkos v. 2.0
- // Copyright (2014) Sandia Corporation
- //
- // Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
- // the U.S. Government retains certain rights in this software.
- //
- // Redistribution and use in source and binary forms, with or without
- // modification, are permitted provided that the following conditions are
- // met:
- //
- // 1. Redistributions of source code must retain the above copyright
- // notice, this list of conditions and the following disclaimer.
- //
- // 2. Redistributions in binary form must reproduce the above copyright
- // notice, this list of conditions and the following disclaimer in the
- // documentation and/or other materials provided with the distribution.
- //
- // 3. Neither the name of the Corporation nor the names of the
- // contributors may be used to endorse or promote products derived from
- // this software without specific prior written permission.
- //
- // THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
- // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- // IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- // PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE
- // CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- // EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- // PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- // PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- // LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- //
- // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
- //
- // ************************************************************************
- //@HEADER
- */
+//@HEADER
+// ************************************************************************
+//
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
#ifndef KOKKOSP_PROFILE_SECTION_HPP
#define KOKKOSP_PROFILE_SECTION_HPP
@@ -100,4 +101,4 @@ class ProfilingSection {
} // namespace Profiling
} // namespace Kokkos
-#endif
\ No newline at end of file
+#endif
diff --git a/packages/kokkos/core/src/Kokkos_Qthreads.hpp b/packages/kokkos/core/src/Kokkos_Qthreads.hpp
index b8c9a83ad..c7f4f96e5 100644
--- a/packages/kokkos/core/src/Kokkos_Qthreads.hpp
+++ b/packages/kokkos/core/src/Kokkos_Qthreads.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_ROCm.hpp b/packages/kokkos/core/src/Kokkos_ROCm.hpp
index b83494134..93f0ec430 100644
--- a/packages/kokkos/core/src/Kokkos_ROCm.hpp
+++ b/packages/kokkos/core/src/Kokkos_ROCm.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_ROCmSpace.hpp b/packages/kokkos/core/src/Kokkos_ROCmSpace.hpp
index 2307b90a8..1df5aa5c8 100644
--- a/packages/kokkos/core/src/Kokkos_ROCmSpace.hpp
+++ b/packages/kokkos/core/src/Kokkos_ROCmSpace.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_ScratchSpace.hpp b/packages/kokkos/core/src/Kokkos_ScratchSpace.hpp
index 62563e40d..d73868a7e 100644
--- a/packages/kokkos/core/src/Kokkos_ScratchSpace.hpp
+++ b/packages/kokkos/core/src/Kokkos_ScratchSpace.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Serial.hpp b/packages/kokkos/core/src/Kokkos_Serial.hpp
index 8518fe38b..aa2db28d7 100644
--- a/packages/kokkos/core/src/Kokkos_Serial.hpp
+++ b/packages/kokkos/core/src/Kokkos_Serial.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_TaskPolicy.hpp b/packages/kokkos/core/src/Kokkos_TaskPolicy.hpp
index 53ebd31c9..b27b313a8 100644
--- a/packages/kokkos/core/src/Kokkos_TaskPolicy.hpp
+++ b/packages/kokkos/core/src/Kokkos_TaskPolicy.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_TaskScheduler.hpp b/packages/kokkos/core/src/Kokkos_TaskScheduler.hpp
index 814b37bde..8fcf73762 100644
--- a/packages/kokkos/core/src/Kokkos_TaskScheduler.hpp
+++ b/packages/kokkos/core/src/Kokkos_TaskScheduler.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_TaskScheduler_fwd.hpp b/packages/kokkos/core/src/Kokkos_TaskScheduler_fwd.hpp
index afafb04c9..0716a74af 100644
--- a/packages/kokkos/core/src/Kokkos_TaskScheduler_fwd.hpp
+++ b/packages/kokkos/core/src/Kokkos_TaskScheduler_fwd.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Threads.hpp b/packages/kokkos/core/src/Kokkos_Threads.hpp
index a84c895fb..2253b8196 100644
--- a/packages/kokkos/core/src/Kokkos_Threads.hpp
+++ b/packages/kokkos/core/src/Kokkos_Threads.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Timer.hpp b/packages/kokkos/core/src/Kokkos_Timer.hpp
index 275b12784..2b172b4e4 100644
--- a/packages/kokkos/core/src/Kokkos_Timer.hpp
+++ b/packages/kokkos/core/src/Kokkos_Timer.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_UniqueToken.hpp b/packages/kokkos/core/src/Kokkos_UniqueToken.hpp
index 6d7b3c4a6..750862378 100644
--- a/packages/kokkos/core/src/Kokkos_UniqueToken.hpp
+++ b/packages/kokkos/core/src/Kokkos_UniqueToken.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_Vectorization.hpp b/packages/kokkos/core/src/Kokkos_Vectorization.hpp
index 3e9ccb78c..4fff69720 100644
--- a/packages/kokkos/core/src/Kokkos_Vectorization.hpp
+++ b/packages/kokkos/core/src/Kokkos_Vectorization.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_View.hpp b/packages/kokkos/core/src/Kokkos_View.hpp
index b166fc4c7..ea9516635 100644
--- a/packages/kokkos/core/src/Kokkos_View.hpp
+++ b/packages/kokkos/core/src/Kokkos_View.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_WorkGraphPolicy.hpp b/packages/kokkos/core/src/Kokkos_WorkGraphPolicy.hpp
index c4a94a8bf..c88e0faff 100644
--- a/packages/kokkos/core/src/Kokkos_WorkGraphPolicy.hpp
+++ b/packages/kokkos/core/src/Kokkos_WorkGraphPolicy.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Kokkos_hwloc.hpp b/packages/kokkos/core/src/Kokkos_hwloc.hpp
index 69268961a..5431a8442 100644
--- a/packages/kokkos/core/src/Kokkos_hwloc.hpp
+++ b/packages/kokkos/core/src/Kokkos_hwloc.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.cpp b/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.cpp
index 92aa07b96..32ff91827 100644
--- a/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.cpp
+++ b/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.hpp b/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.hpp
index 32620fb0f..8260d61fb 100644
--- a/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.hpp
+++ b/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Parallel.hpp b/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Parallel.hpp
index e88237a51..4607aa944 100644
--- a/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Parallel.hpp
+++ b/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Parallel.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.cpp b/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.cpp
index ca2f2789a..0deca5830 100644
--- a/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.cpp
+++ b/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.hpp b/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.hpp
index d05ed091e..5fd0ce1d4 100644
--- a/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.hpp
+++ b/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Team.hpp b/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Team.hpp
index 942fc9e24..4eddce13f 100644
--- a/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Team.hpp
+++ b/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_Team.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIAvail.hpp b/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIAvail.hpp
index 70a537c43..d15c5ce8a 100644
--- a/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIAvail.hpp
+++ b/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIAvail.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIDecl.hpp b/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIDecl.hpp
index 1e19381cf..6e7edbf7c 100644
--- a/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIDecl.hpp
+++ b/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIDecl.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_WorkGraphPolicy.hpp b/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_WorkGraphPolicy.hpp
index e5970c176..77678ce2f 100644
--- a/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_WorkGraphPolicy.hpp
+++ b/packages/kokkos/core/src/OpenMP/Kokkos_OpenMP_WorkGraphPolicy.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTargetSpace.cpp b/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTargetSpace.cpp
index ec58c57e0..43fef7db2 100644
--- a/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTargetSpace.cpp
+++ b/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTargetSpace.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.cpp b/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.cpp
index d39767627..c70d9611c 100644
--- a/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.cpp
+++ b/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.hpp b/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.hpp
index 0aa6e5862..5115c3e46 100644
--- a/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.hpp
+++ b/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel.hpp b/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel.hpp
index bea8d5e7c..4bcdb7320 100644
--- a/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel.hpp
+++ b/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.cpp b/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.cpp
index 68fdd9e03..87361401f 100644
--- a/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.cpp
+++ b/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.hpp b/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.hpp
index 27b563ac5..dc1dada79 100644
--- a/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.hpp
+++ b/packages/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.cpp b/packages/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.cpp
index 5dfb79924..5b4d097d4 100644
--- a/packages/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.cpp
+++ b/packages/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.hpp b/packages/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.hpp
index 4963bb08d..1e5d61831 100644
--- a/packages/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.hpp
+++ b/packages/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_Parallel.hpp b/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_Parallel.hpp
index ba610b42c..c9b3787c4 100644
--- a/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_Parallel.hpp
+++ b/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_Parallel.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.cpp b/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.cpp
index 0bf21aa4c..bb037353b 100644
--- a/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.cpp
+++ b/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.hpp b/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.hpp
index 0a842b0dd..345664dd8 100644
--- a/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.hpp
+++ b/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue.hpp b/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue.hpp
index 31c611e14..7a4364ab7 100644
--- a/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue.hpp
+++ b/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue_impl.hpp b/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue_impl.hpp
index 21e27081e..3a7bf1fd4 100644
--- a/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue_impl.hpp
+++ b/packages/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue_impl.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/KokkosExp_ROCm_IterateTile_Refactor.hpp b/packages/kokkos/core/src/ROCm/KokkosExp_ROCm_IterateTile_Refactor.hpp
index c9594edac..6dbb7d828 100644
--- a/packages/kokkos/core/src/ROCm/KokkosExp_ROCm_IterateTile_Refactor.hpp
+++ b/packages/kokkos/core/src/ROCm/KokkosExp_ROCm_IterateTile_Refactor.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Atomic.hpp b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Atomic.hpp
index db3190ae8..a22abdd9b 100644
--- a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Atomic.hpp
+++ b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Atomic.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Config.hpp b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Config.hpp
index 87840bb37..ccb88361b 100644
--- a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Config.hpp
+++ b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Config.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.cpp b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.cpp
index e9ac81036..c3968020a 100644
--- a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.cpp
+++ b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.hpp b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.hpp
index 870520c0d..d90337da6 100644
--- a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.hpp
+++ b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Impl.cpp b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Impl.cpp
index d43cec464..c63b201df 100644
--- a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Impl.cpp
+++ b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Impl.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Invoke.hpp b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Invoke.hpp
index 6fe77e6f9..03a41f206 100644
--- a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Invoke.hpp
+++ b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Invoke.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Join.hpp b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Join.hpp
index a1ecc1f38..ad6220bc5 100644
--- a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Join.hpp
+++ b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Join.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Parallel.hpp b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Parallel.hpp
index 51775afd3..0cb647de0 100644
--- a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Parallel.hpp
+++ b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Parallel.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Reduce.hpp b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Reduce.hpp
index e8b0411fb..4765f1bbc 100644
--- a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Reduce.hpp
+++ b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Reduce.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_ReduceScan.hpp b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_ReduceScan.hpp
index 9f25312ef..c31f569a1 100644
--- a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_ReduceScan.hpp
+++ b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_ReduceScan.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Scan.hpp b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Scan.hpp
index 687e2a80d..a33f26ad2 100644
--- a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Scan.hpp
+++ b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Scan.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Space.cpp b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Space.cpp
index 88de70fbb..60026cc0a 100644
--- a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Space.cpp
+++ b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Space.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Task.cpp b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Task.cpp
index 7bcf8d4e3..6f5f61f24 100644
--- a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Task.cpp
+++ b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Task.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Task.hpp b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Task.hpp
index 22464acdb..a4aa41a5a 100644
--- a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Task.hpp
+++ b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Task.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Tile.hpp b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Tile.hpp
index 20206f003..5ce1d91e0 100644
--- a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Tile.hpp
+++ b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Tile.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Vectorization.hpp b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Vectorization.hpp
index 1b1ec9cad..9afbf1b53 100644
--- a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Vectorization.hpp
+++ b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_Vectorization.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIAvail.hpp b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIAvail.hpp
index 946853587..0ce3dcc6f 100644
--- a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIAvail.hpp
+++ b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIAvail.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIDecl.hpp b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIDecl.hpp
index 3eeb89466..fb8cfef44 100644
--- a/packages/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIDecl.hpp
+++ b/packages/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIDecl.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIAvail.hpp b/packages/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIAvail.hpp
index 2e4c3e80b..4037d90b9 100644
--- a/packages/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIAvail.hpp
+++ b/packages/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIAvail.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIDecl.hpp b/packages/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIDecl.hpp
index 3ecd51eac..42788809d 100644
--- a/packages/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIDecl.hpp
+++ b/packages/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIDecl.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Threads/Kokkos_ThreadsExec.cpp b/packages/kokkos/core/src/Threads/Kokkos_ThreadsExec.cpp
index 403f58c61..8ed7d9b65 100644
--- a/packages/kokkos/core/src/Threads/Kokkos_ThreadsExec.cpp
+++ b/packages/kokkos/core/src/Threads/Kokkos_ThreadsExec.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Threads/Kokkos_ThreadsExec.hpp b/packages/kokkos/core/src/Threads/Kokkos_ThreadsExec.hpp
index 556ee18d5..cbffdc20d 100644
--- a/packages/kokkos/core/src/Threads/Kokkos_ThreadsExec.hpp
+++ b/packages/kokkos/core/src/Threads/Kokkos_ThreadsExec.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Threads/Kokkos_ThreadsExec_base.cpp b/packages/kokkos/core/src/Threads/Kokkos_ThreadsExec_base.cpp
index 3e6ae4b64..6b0439430 100644
--- a/packages/kokkos/core/src/Threads/Kokkos_ThreadsExec_base.cpp
+++ b/packages/kokkos/core/src/Threads/Kokkos_ThreadsExec_base.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Threads/Kokkos_ThreadsTeam.hpp b/packages/kokkos/core/src/Threads/Kokkos_ThreadsTeam.hpp
index bee03c2b3..fda665c4d 100644
--- a/packages/kokkos/core/src/Threads/Kokkos_ThreadsTeam.hpp
+++ b/packages/kokkos/core/src/Threads/Kokkos_ThreadsTeam.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Threads/Kokkos_Threads_Parallel.hpp b/packages/kokkos/core/src/Threads/Kokkos_Threads_Parallel.hpp
index 7974cf9cf..349e4d903 100644
--- a/packages/kokkos/core/src/Threads/Kokkos_Threads_Parallel.hpp
+++ b/packages/kokkos/core/src/Threads/Kokkos_Threads_Parallel.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIAvail.hpp b/packages/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIAvail.hpp
index a86913c20..ad9f19e6e 100644
--- a/packages/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIAvail.hpp
+++ b/packages/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIAvail.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIDecl.hpp b/packages/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIDecl.hpp
index 323bd1d4e..b73c100f0 100644
--- a/packages/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIDecl.hpp
+++ b/packages/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIDecl.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/Threads/Kokkos_Threads_WorkGraphPolicy.hpp b/packages/kokkos/core/src/Threads/Kokkos_Threads_WorkGraphPolicy.hpp
index a453c9752..f250c24d2 100644
--- a/packages/kokkos/core/src/Threads/Kokkos_Threads_WorkGraphPolicy.hpp
+++ b/packages/kokkos/core/src/Threads/Kokkos_Threads_WorkGraphPolicy.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
index 72010a4a7..1cde6a5b5 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
index e01195d19..d0e79f452 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
index ebd77aee6..ccca17e1e 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
index f3d248eaf..f0637eac3 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
index 3ebb0f1ae..4c9e5f383 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
index f4a6534d5..547b0e46a 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
index 3a47e662a..bd5eb79dc 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
index 147027e62..8153682e7 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
index dc3e5d38a..bd58b7ef6 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
index dfc43258e..ee7209a87 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
index f391bb7fa..4896686e2 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
index b8a794449..e4efb0bec 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
index c7c9f1b7d..ef3ffc980 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
index 92c357c11..637a84544 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
index afc4c1372..13279de2b 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
index 07bba7ab7..6de1749e0 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
index 5a8aa732c..e67e822c8 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
index 716510779..4e3a981cf 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
index b2bd23d25..41e3f6e3b 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
index 143593185..6fe3fe756 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
index c5a813037..98eefffd4 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
index cbaeb73e0..075a37310 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
index 1ef039471..547430ca3 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
index 0f2f756ae..c59242249 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
index 40287d4dd..a423d36c1 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
index 0dc89e670..bb2008b7e 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
index 2a7b27075..5bd714dcb 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
index 5c4d065f0..992924e94 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
index 830b2498c..6512df387 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
index 34a22f3b2..add8d12eb 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
index c5fc914a4..71a033447 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
index 9d28eca4e..5e4f2cf91 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
index 9472fddfc..61834ccc4 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
index 522ed3933..c570bccd3 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
index 7a21ee976..01e4a1e8e 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
index ca73b9d50..0ea499050 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
index 6526dfe21..1e5dcd105 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
index 2da6a4879..6f7b062b5 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
index dc7f368f6..bbc58f46f 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
index 07155ea49..fbddd5252 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
index 1624ce9f9..dd812a4f8 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
index 501318904..76df5a56b 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
index 18e1c3598..095d015f0 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
index 3c78d5385..881dbed18 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
index 7b7eae31b..62c0a1a83 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
index 625cb9d7c..32e2b6616 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
index 7d52f0201..98c661ce4 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
index 712d0b649..2b7527618 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
index f9d6f26b7..f9d0b211c 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
index 95f60ffb3..2ce87df05 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
index 40a785454..fb51f35b1 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
index f13c7076e..1003ca4ee 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
index ef2e155ef..fc256368a 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
index b952f3f88..eb96b5c48 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
index 76256baf4..43e19744d 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
index 59db5547a..a936e15ac 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
index e94a2eae3..e8efb4864 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
index 101abb3c1..d626de437 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
index 65cfb3acd..6d1e45763 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
index 8f7e38b23..3150bc26e 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
index 2cac269ec..0eb3ea7d7 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
index 51f124ae3..1f6492ef9 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
index cdf130f6f..7205458dd 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
index c56618f8a..348f1c1a2 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
index 88615f453..2de8f7c11 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
index f024fe4aa..062dced31 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
index 9b3e1ae72..7d88e4908 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
index 51b1fc550..aa136bac0 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
index 70d5875a6..7d3c8a772 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
index 8fc5b9042..fce597033 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
index 6a96fcb11..7c5fc3ccb 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
index e983091dc..0becc936a 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
index 3ba48dfcb..f1a58364c 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
index 7826e5fdd..fee1dd5ec 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
index 60a068746..442753a9a 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
index 07abb7257..18151e8a7 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
index 9d44dbd9c..e38c452e2 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
index 1e68e32ea..640c331ac 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
index 1115660fe..25de09625 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
index 1c1d0df36..6db95d4aa 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
index 68e32332a..c7f3c8933 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
index 5ee836631..1586f4fb5 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
index ed1476c83..9cb5814a1 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
index 2c88e6b72..597a6c7ac 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
index 74b83e936..fb0c31562 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
index 4360c9fb4..e4ccc5033 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
index 62ae767ef..e64efc73c 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
index 8c822a7d4..b1121d845 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
index 743a801a6..e3a9a8555 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
index 1173ff4a8..55a2ebeee 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
index ba15e6456..8aa937e26 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
index f34ed60f4..884d50a9b 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
index 3ae731792..7fb378d00 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
index 3e0bde830..80cace19b 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
index a669ae1ef..8babd4049 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
index 2d50a0c45..4468b6886 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
index 192d0ed99..91f33295c 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
index 6a04a06f3..2fc663053 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
index e048e7b50..2a7d0b47d 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
index 739f684c1..ae44f1b87 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
index fe429fe3d..54677d347 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
index 33e4ae973..08902c18f 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
index bddce15e8..7f60564c6 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
index 4cf98fbe8..cb85501e4 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
index f378a83ba..42dff4adf 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
index cd76b5fe5..81781437d 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
index 63c6b683e..4ca0c5f97 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
index 1db22a701..eb6e1d2fa 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
index 9bb74eee7..0d05e9eb5 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
index 95f5b7a21..74a56297f 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
index 9f23b776a..f01fc7349 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
index 7daace85d..f34eda770 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
index a1fc1b530..7f3180511 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
index 0f0f48d2c..a11043974 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
index 58b8c1763..a61fb78f8 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
index caa797173..63f8c2bcf 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
index dd0e6cada..d33b22c9d 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
index 4a677a64c..737399b97 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
index e3ba60d1c..74e0619db 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
index 6d1929810..d968fcc06 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
index 6f897b188..abda55e27 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
index af6adfcb4..cba5819d8 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
index 440311aff..4e07f1740 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
index c140d9071..01fd6d185 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
index 2b6d7a503..8c8566633 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
index 1d10c3f6d..2ae8ec4f1 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
index c2d4c6f7c..3685756a3 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
index 3c413535c..5cdbb77c1 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
index c14941cbe..63dae6494 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
index 5baefee70..9e250e1e6 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
index ff5bfd6f8..9cab75cf3 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
index 0c7e5f835..386ac908b 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
index 983446bc9..8ee792744 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
index 0d42f9626..d806f9f82 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
index 3f4572d74..7e835ee83 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
index e1d3b03d4..82f29e579 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
index c3c4748c6..0c67a21fc 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
index 58ba48eaf..fa492d0c6 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
index 8716fc174..c2cba6a45 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
index 9a574155b..333410137 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
index d40847ba2..6f051abc7 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
index 257753c12..bf61660d8 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
index fd2e33d4e..ea8e2439c 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
index 7dba4a5d7..81e15f5eb 100644
--- a/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
index 3cdfb0dfb..192d2c03e 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
index a4b7d9869..a6438f20e 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
index 4ae56eeb8..1503f3aac 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
index ebb4c165c..8e2d666d2 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
index 08c1d36db..06ea9660d 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
index 1317de7b2..7c715376d 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
index 7311857c5..e971d0f0d 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
index 97d4fd621..3f29d4c6f 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
index 8c6cbfbf4..7e0248e70 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
index 31c69cf3e..64d587316 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
index 8d475bd17..85a088655 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
index 6070118f5..3e2d83322 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
index 4dff60350..b2de31b87 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
index 3a52b05b8..aa5c584d2 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
index 359524dd9..43ed25192 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
index 1980392c9..5ca536d98 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
index 62a691387..659ab8c7b 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
index 6a1ad51d7..c1e57d2db 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
index c432c0ad8..861638ae0 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
index e74ce86be..36373daea 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
index 40d9e90b7..58007533f 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
index 811a2ca84..1ecc0bad6 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
index 8ab764c11..73d1389b8 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
index 4b486c7cc..1f7645908 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
index b7f702c39..0d9505205 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
index 1e52a3435..b24a61a36 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
index 4e0293d07..c3d120212 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
index 756aa721e..6a0dc4678 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
index 0a60bda9d..4e7f39fac 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
index 16112200a..792b803bf 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
index 5b512c3ee..549fef232 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
index 98eafb1e0..399734817 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
index 156309cd8..1e641c4e8 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
index 37e287865..6626ff47c 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
index 1322c3d6a..1832b6f91 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
index 28558e68f..319835686 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
index f2ec6588c..83e373419 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
index c0490164e..fc1382582 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
index 5e2088347..a95a61206 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
index 25c0ba75b..3dafee86f 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
index 1d32547f3..6460a7e1f 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
index a78a3371f..1affdd1ad 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
index 31bae66a8..ba382d008 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
index ace42693b..d9d46059a 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
index e772068ea..62235a495 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
index 9651e9f4a..c34e570cd 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
index 7157ca568..26dcc5044 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
index 2f1624817..573c8e4e0 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
index 85c3d8b0f..d31644c58 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
index 053bd75a2..9ec317af7 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
index bb62a140f..07b933077 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
index 5a3e5ef55..36e85a869 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
index 93e0fdb0f..db9a32b08 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
index 0eaf7dd54..75f823174 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
index 2ed4b4c07..2d27f5e70 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
index b570a1db4..2dddeeecd 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
index be7d3eee2..d84fd33cc 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
index 63515eb3f..672c126cb 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
index e4875a32e..a39006a5b 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
index ea401fcf0..d2880155c 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
index 86a516041..e04355ca9 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
index edc836f6d..7c4e77ddf 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
index 152615afd..3b88050f1 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
index a3213fb3b..e4acf3028 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
index 53a09b3c4..0b189cd93 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
index 1e8ae4f1e..c7cfae16c 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
index 54d4030fe..eaa5243ff 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
index 9f3bff428..d0c159f50 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
index f56f12172..e0e0b82c1 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
index 474c4a4a5..da6ad1079 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
index 6ae6108a2..d736cf10d 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
index 9b9ad3b4f..3f191de4a 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
index f7e3a1bf1..ae279b660 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
index ae0eea9a1..43718f54e 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
index 65f8fb30b..c43f02b2b 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
index 0f6b857ff..ab529d3f3 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
index a7aecd87b..86b032806 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
index 6a97abc17..96bc3ec4c 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
index 4fda33459..93333565d 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
index a5916fc83..b6d740eac 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
index ecf363315..a06b2a287 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
index d5871fb75..8a829449a 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
index 7ac127051..04e2026a6 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
index 23c7e69d4..bbd3af0ea 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
index 06e3d014b..48b52fa1c 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
index cdedc8a3a..8b96319c0 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
index 7e51bb434..6cd006b49 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
index ffaf900a5..ad2696190 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
index ff7b4c290..ba8f38eb1 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
index 3cc7eb2e2..62ffacf2a 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
index 0f51cd67e..9f6ae5edd 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
index 4ac1e245b..0a1d7d530 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
index 8205c30ee..3408d481f 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
index 523799ea9..94f343c7d 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
index 0c439a171..c9aae852e 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
index 5eb00b966..9d07ec270 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
index 1ec59fbfb..3ed4bae4a 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
index 3b4205857..4ba84b5f6 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
index 91f137e15..8d5262453 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
index 800bd711f..4eb5b2392 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
index 0b2a5a34c..6486f098e 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
index 7622875ba..b88b164d8 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
index 43f328fb9..4c342be55 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
index f7eeb75ad..928af84bb 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
index ffbeeb7a8..ab53ebf69 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
index f5d101b09..07f89b3ad 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
index ee3a5fb0b..8be5df1c5 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
index f0dad8438..bdc9afa83 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
index 3a4e11f91..79f420568 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
index 9ae97ba80..e78d209c1 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
index f91b6eee3..5927dce0f 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
index 790f2a506..5d035f536 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
index 97f9784c0..0f73450d1 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
index 70d68fcc7..bf9d4aae7 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
index 812aaa110..8b5e12aff 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
index 72b42abff..2ad504df4 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
index 880e1b7d7..cb9bb0e28 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
index b8d807df1..fcbb3b7b0 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
index deb74d798..564ea37a6 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
index ff65bc882..ae9c052d8 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
index d98e25a59..0ce0e7605 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
index 2229663cb..3b69d00b8 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
index 5cd356766..13d756ef7 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
index 2cdc10cb1..1a4a5e5b5 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
index 4af8eb2ec..ac7b4ea94 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
index 72994cf02..dcd6ac844 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
index a916f10ab..b43e5c1cd 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
index 63ffb5567..1abbdf02c 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
index cbcfed48d..4bbdf69d3 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
index 006c5edce..e046b5f2f 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
index 396966292..c38a5b2c8 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
index fa8a3b2d5..7fc5527f2 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
index 6719f27d3..540554a7d 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
index dc965a3b3..95d3d645b 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
index 312225813..0e6a0b919 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
index 85a4a3058..e7f1f5f1e 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
index c28906064..f497be645 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
index 2570bebe0..b51fae1f2 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
index 26117ee5c..29a160cfe 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
index ca32832ba..06513c4fe 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
index cf45a21f9..061e6aa59 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
index 90103410d..6301b882b 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
index dfaf8bf23..e1680d211 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
index 0cc025493..30d2d17ae 100644
--- a/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
index 52aeb9118..b32077a27 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
index 7be7c20bf..437a5e2fe 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
index 0ee889c5b..e989423cc 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
index f7096836d..9ed093bb9 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
index adc334a75..87a3d2099 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
index 84c517ef3..5715b813a 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
index ef8df12c7..ac36f38cc 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
index c88a6aa7d..ea3f168f7 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
index e3f750e08..72ac14e9d 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
index f933416db..6ba558cad 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
index e72620da7..9ec7749f2 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
index 8965679a0..28fe36eda 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
index b6e3a626f..567ef04a7 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
index 806976e53..dbe94a9b4 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
index 038cd4231..ab106740f 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
index 30ec6d2a8..13d8708cf 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
index 9f702c041..bcb11092d 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
index 77ee1ba52..637654cd9 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
index 14fa4f3f2..4efa04b82 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
index 0c329238c..1821d80ec 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
index dac08f98a..ca3b30d9a 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
index 5d6dfcbb5..350eaa9b3 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
index 49192f0ee..42ebbb5a5 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
index 0ce551485..55de751e9 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
index 0488bced2..282bd9192 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
index 6c7c864bf..e36b38263 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
index 9a63b7d0d..5ded26404 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
index 1428fbac5..69dc320fe 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
index 239235edb..e4b9431e5 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
index 85daedf6f..c603124af 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
index 9d3fe1c3a..cb064ee3f 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
index f660ae8bd..6e4b94b80 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
index 180ca755a..10e8ea607 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
index 256664fcb..14ec7824d 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
index 009b99f99..28240c1c1 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
index 79a3b0af5..b43ae0cc7 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
index 4aebc721e..2cb11f377 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
index 7edda3977..e65ef4917 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
index 5c636981f..5574a0d41 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
index b1b6b682a..95da90645 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
index c2db7b3b2..896532517 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
index 6dfb7552c..13548d173 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
index fcbcd593c..5a6856d6d 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
index 1a4578e60..f173642f6 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
index d6a68b877..da2b88542 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
index 77155efe0..663ed84e8 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
index 19c72dd20..99984b1f7 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
index d96668ed3..7026dd849 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
index c3880fffa..bd051fc54 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
index fbd630db9..e59b33282 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
index 2cea53b9f..af694a145 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
index 14111db85..db0086dc7 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
index e677a16d1..a500f11de 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
index 7d33a55fb..649b994ac 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
index 103a89637..b0a2b8bfb 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
index 436ba5261..3441ce154 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
index 729a12953..c9e3c9e9e 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
index fc25be370..234f171d3 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
index c19dd4471..306f742e2 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
index 51af17a2e..0b782a170 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
index 315049c5e..b945727f2 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
index 0952f9ea9..97ac54d8b 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
index a080f34ad..b33f23459 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
index ef3f8b30e..554b65044 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
index 6cdb54446..f42a641ed 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
index 9ee7e32a9..77c298903 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
index 4c8480c26..b349eb9a5 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
index 2de20e638..213c94475 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
index cc1cf1280..bd9a56740 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
index 62a3dc330..c82e00acd 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
index fb9354abc..98d808248 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
index b302386a6..001fddc21 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
index 5c73cd7b1..eb80ca1b2 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
index 6234a13d0..5eb174ab6 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
index ea1850015..73224b270 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
index da3ade0d4..41836e070 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
index 204ef53c5..ba8eb1e6c 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
index 81166a817..611f4af7e 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
index 76e78e070..a878cc552 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
index 0742632bb..5d75d19c3 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
index e7e3505ef..bcbb6f84b 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
index 064775813..e6eac8df1 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
index d7ff08241..a1178da93 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
index fad19f7b1..3816365a3 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
index 00ad6dfff..80ca4c691 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
index 2bb1cd751..e694703c7 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
index da2e52f52..2f7686ff9 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
index c80f36883..55830bf64 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
index 48315e294..0eb7838f4 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
index aaaa5b533..2984235dc 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
index f016d53e7..df314005c 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
index ea9991313..c332cbfce 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
index 38cb12318..26f6e2e93 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
index 2989da02e..a25c8e324 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
index fbc9bb221..2e9084c72 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
index 12812a204..78dc8b71e 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
index faf3ab26c..07b85cb13 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
index bae931568..7de9885aa 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
index 887f62bff..2a0ab51de 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
index f27ca9a0d..e27304241 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
index c164df0ac..934ca8511 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
index 6949ef513..4f0904de4 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
index bee554b9a..a504769bc 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
index 16082691d..f7746effa 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
index 381291c4e..eb0baab2b 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
index be65d6f0d..10f757c14 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
index 63253e84b..a9df84e0a 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
index 5f68fcd19..41af198ec 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
index 47320a415..ab9b2e5cf 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
index 35945ecbe..ea958e9fb 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
index afe2aabaf..15ab132c6 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
index 48d13e1fd..90c50ecac 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
index 26bae8662..ce17ec4ac 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
index 80535956a..fb19438a3 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
index 4787bb493..6172f917f 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
index bdb7365a7..b5176f35f 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
index 8e73e5299..54192233b 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
index fffe70fba..b4dd93c89 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
index 4b5486bab..d467e5519 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
index fa14e5c34..0af369efd 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
index c02b638b5..a02956d60 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
index 08e7914e3..1f3775d95 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
index 34b49cd4f..eacd79693 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
index 61dede379..e42fa65e0 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
index 3eab66999..0652a0d31 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
index aad20b8ae..1638ee177 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
index 27c74d0c4..bad805dbd 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
index 01bd3491d..ee73c7631 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
index 1cc00ed9f..afa629829 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
index 10f21f1d3..c5317a87a 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
index c622ee55d..ec22e0147 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
index e787c5cf0..521487c3d 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
index 57d66abc5..5da88f90a 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
index aaa03e57b..e58d58136 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
index 55b12c7c7..46010a921 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
index 51c24e834..09f0355ca 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
index 201b10002..f73d87e43 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
index 7522564d4..8a21dcc75 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
index aa73d5e5c..88b30174e 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
index 8ae8224ae..8179b159f 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
index 51c31c516..88e1d3e65 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
index 10924534b..5cbb68df2 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
index 59a08ebb0..70839316e 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
index a93c50f38..41114a165 100644
--- a/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
index 198f0274c..7d37ab9dc 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
index 8545e93d8..94fc43e37 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
index c38c4cbc2..b78cbd1b7 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
index 7f2433fea..9c327fc44 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
index a372738e6..cb8a2e019 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
index 0e667632f..cf02d8fa5 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
index f1752c7b0..e7ddd81f9 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
index e6f2b850a..43a9fe5c1 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
index 41eee1bf3..1cbe3468e 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
index 191d9b9a5..b8bea66dd 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
index b9b14d60f..e52711fbf 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
index b67bfb1e4..894ada67b 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
index fd8f684c6..d9ddd1061 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
index e8ffbf1ff..924428bbc 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
index c11a05295..efa606d9c 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
index 11c64c3cc..9d5423604 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
index cd85d8f9a..7e7337086 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
index 931de91f6..2f1423eed 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
index c38563938..5e0a0d761 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
index c1b94b5c1..a4eaeb707 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
index 2c1b61d57..17380a1ae 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
index ad73cac3f..8d48baf27 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
index b4c5b7225..b9c5d70d4 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
index 1047eed82..684dd1f56 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
index 0bcb805b0..f4194b86d 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
index 76cfc93ec..5ca438e9a 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
index 7b53feab7..beadb4d6a 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
index 2fab5b48e..4c6f4ec59 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
index fe14568f3..2ee026b13 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
index 1d6fe759c..afb95566c 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
index dae3b6740..b7d672b72 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
index 52e7af4ee..cecb43103 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
index f7e639401..317f6eb7b 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
index 5135a7fb2..7624472ca 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
index 13f680c21..f31c3e9d7 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
index a0caa6933..5ddad7bf7 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
index 39f8dac2f..ae829ab39 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
index e25660c1b..01ed36182 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
index 4e9203a87..dd15ded43 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
index 39611f054..8627b74a0 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
index 1aff26c1a..8de0eec37 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
index 0e6b74bfc..e3a067d7d 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
index 87cb7d467..3bb19a417 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
index ff94c6892..f96cde6c5 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
index 12fde9c57..bf381f264 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
index 10faf649d..9060ae50c 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
index ff1a89545..f2afa6b62 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
index 035e75399..dbb00631a 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
index 73caf5717..bade54342 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
index 8fe91cf7b..b5413beff 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
index 38f03514c..1e544b067 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
index 46096b7be..9d3c42013 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
index 8700a8df7..1b0b62902 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
index e10667eaf..c1c35d66c 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
index fe1fc534f..ac00cc37d 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
index fc059842e..7bcfea7de 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
index 40549898f..b8a585731 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
index a74b74973..ee6b1d95e 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
index 55d33b2d6..6b060e837 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
index b90d973ac..dee1edbe0 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
index 2331d74a9..fbe7cfb6a 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
index 59e60f527..1c2b6809b 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
index dbd31c809..708554816 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
index 78d0ac32b..9dd837ea3 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
index fe4c2dcd7..13a1d0d86 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
index 54fe96079..7d8e0b171 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
index 106fb1b5a..413492165 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
index 8c9183744..efeaf2816 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
index ac4dfce4f..a162a49d7 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
index 7197d2d7b..e02e7c4c4 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
index 319485fc7..0f3bc4f1c 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
index 7d3736ae5..409492081 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
index 375f5e659..6fbd0f417 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
index 651a39a20..5ea4ceef8 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
index 80d2eeb10..4d336c58e 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
index 28addfedf..4349fb1c7 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
index 9a588fedd..306a7a67d 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
index 025b61dfe..b2e6f6824 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
index a9bb7f904..f25223b85 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
index 419a4d145..95f6c5b9d 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
index fc535d31a..f221141c5 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
index 6116b1985..68d58c5b1 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
index 766211c7a..3710878be 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
index a18741d89..d0d8b8f0a 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
index 709076c52..e1320b332 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
index fb4198260..ed6fe0670 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
index b4e93c5f3..ef32b7848 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
index 9e4d792e9..1db3b2845 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
index a262af35c..e2842d924 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
index dbed13a62..5ca4720d4 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
index ae6474306..baa0e582a 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
index c2af2d704..bc022f97b 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
index a1ed2bfe5..108d3e963 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
index ab18a005e..1a6601500 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
index 67ea044b5..fb515774b 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
index a4720894b..012f2116d 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
index 2a60ab9db..2eee054dd 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
index 257be28a0..a35acb3ac 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
index 3e45e9cf6..0ba80f1bc 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
index bf0512a77..1e046b521 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
index 6480885a4..1a6bd4ed9 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
index 03b8e6951..5d1c44d0b 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
index 57e05233d..f356973af 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
index 8026fc055..9f9fb49ec 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
index 9bf9c3336..2000c9600 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
index 3137da433..b3348a37c 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
index a78565a8f..f2b26ddf6 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
index 42655853d..1ea222364 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
index a78c14356..f544d4d83 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
index d866181b1..cbe97e793 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
index 1ac60b86f..a5c432ea2 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
index d4fc2d75b..2074c1c9f 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
index e1fa05598..27ca400c1 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
index c41f66076..7dce168ab 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
index b5a25a58b..999795c08 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
index 30239ae65..274d9150b 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
index a0f96da93..72c495c99 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
index 36e1e9fd0..7cb3b3d53 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
index 6becf99e4..016567cbc 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
index c23b9bcef..e78ae3cc4 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
index f642f0705..ce9317111 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
index 9d3ce4d14..5aeec9470 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
index 7f98c4e51..3ed1e93e9 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
index 2f6a2d3a2..3cebf6c87 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
index 38dab4075..91cbab881 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
index 089f8b69d..5512f62a0 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
index afda5adaf..4f023463f 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
index 5672c9a80..7cc8357cd 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
index 43ecb505e..228ccae9e 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
index aec9454b4..6c0b33ad8 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
index 75a0cfc8b..51f76bd84 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
index 8d6b93f22..5f1f763e7 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
index 3c0134dcb..c84d95c98 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
index 59d15ebf1..245c30957 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
index f0a6eead5..78a2bee96 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
index 79fc4ae53..84a3238ec 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
index 7b703def8..e20c078f1 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
index add8c9ff5..85b89ec8c 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
index 4a0536d6f..bc3e6aa2d 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
index 8ab7ef10d..e0d741b82 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
index daeb74e5f..0f5f0f90b 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
index afb140f13..4c54a03a0 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
index 26d9d3258..20094d4f0 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
index 9d39882dc..93c582363 100644
--- a/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
index c854da740..6ebe8606f 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
index 93c130e97..3c910b782 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
index 5881c40f1..246d468a9 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
index b629cf334..d4009f45f 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
index d9517a230..d1da85a60 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
index d7c4fdf93..c6be74fd3 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
index 2005b4fef..bc27b453e 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
index 2553b787f..ee1d1e0ea 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
index 6279ff5b0..25e1b3388 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
index 6aec5a9fc..730477a67 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
index b3ed4a7d0..5f84d0fed 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
index 7b1407491..18fae3669 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
index 92b22caab..c970a48a9 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
index fc8782504..969e33b65 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
index 84bbc1b55..9faf4b4cb 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
index f5666f8a2..d3b54b07c 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
index d0daaab29..0463bd711 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
index 1ea192adf..a04226311 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
index c86065b8a..86f0604e2 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
index b314ea732..31bd00896 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
index 59b6b4a02..7d404d67b 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
index 05468808f..bc0b4dc57 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
index 04493abb5..49ea254f2 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
index 92db88e46..cbc2c2c84 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
index 7f222f365..0e1791442 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
index a575a16d8..b9d3f39f4 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
index a1b7037eb..3419ef64d 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
index e559e355e..fa4428d77 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
index 4e275753b..191c26260 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
index 7703e0f65..304308a09 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
index aa73eab15..7460ca524 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
index 02a2a0f1d..94b09fdc6 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
index 9150fe4d5..86279850a 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
index 6561a1d40..5e67be576 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
index 081c18537..2f8a3841d 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
index 983655957..37fe99ef2 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
index 8dc12cfb6..d87ea513a 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
index d8ea0c36d..aaf2cbb78 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
index 8ea79c0f4..49e268fa9 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
index 0c6730d28..a72193ba8 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
index 78a4544c0..dccea68f5 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
index b20b9744f..0b85a413f 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
index 2cfd25830..0072b106d 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
index 70f1c9789..5f506973b 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
index 9469aceaf..db7031557 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
index ff412e6ad..e5cd3c9e0 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
index 4653d35a2..1f645becb 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
index b39a40c23..d138d3749 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
index 673fd7efc..093de6522 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
index 2c39b883b..910b4f31d 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
index 8b3a6d3f9..3d4d4976f 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
index 7719784d1..c51fa8fbd 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
index db56127d9..53c150058 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
index 19d6ba07b..808466ab3 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
index c156f3d45..636b97635 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
index 49b18deb6..3a24b958e 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
index 5312ec8b9..48030c1ca 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
index 835bb1354..6d4184dcc 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
index fa2e99782..25c4eedf1 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
index 3a3c22f01..634542f9c 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
index 2c7fd92d6..967df0677 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
index e096e2bc3..bc6d604ed 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
index bfae0f6b4..fed3bf112 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
index f3a4f4523..cfc74fc4d 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
index 586948e2c..157acd48f 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
index 3c570fbed..70aeee279 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
index fde4b93a3..8b579e608 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
index 825321a97..4b94ee597 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
index dbef705a8..58a912313 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
index 25aea456f..3822f5e2c 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
index 8da566d7f..467b3284a 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
index 39e8ad757..a81de825f 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
index 26baaa652..e317b894e 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
index 86b8fe9d0..751e7bc51 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
index 352f66b33..870b5182d 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
index 8b1db18e7..c22a7ebf1 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
index 4c9f1f8cd..7691271f8 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
index 106fde73e..8c6d1d683 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
index 866b2b3a7..c26153ef4 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
index a1ad3e81d..be167261f 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
index d8fd5fdfa..da19b9376 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
index 1c17b215e..cd6344ec7 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
index 8ecf2eba0..f90603f84 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
index 5d4153741..ddcdfd880 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
index 7066ee302..3f623740f 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
index b1a070cdb..14616bcae 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
index e0bbda197..ef4d84404 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
index 6b8873643..e0998f8be 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
index c279317d9..04d5e3461 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
index cc88b5180..4942b709f 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
index 3d6607180..30d12e003 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
index aa4859c45..56ea2fbc4 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
index 292e31353..40793b365 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
index 330729491..4bfaed6cd 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
index 3444499f4..522cd39cb 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
index 79bb9e06e..81bc0d1c3 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
index 7012f8dc2..472455b13 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
index 7d5779bdc..bde3677a0 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
index 982605a72..2c088533e 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
index b9aec2c24..b7671c386 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
index 781cdcce9..cc751c29e 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
index 9b0d053e4..467e331e2 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
index 3e31e961f..7d2d04798 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
index a4d52c4e3..d295c925f 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
index 8675f4deb..c9674d14d 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
index 09a0c1130..13c50df27 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
index d4ef08d9b..98e502454 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
index 800ba4289..bae858b7d 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
index 84a173340..2d93eb811 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
index 27f2cc24d..56ea8d3d8 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
index a08b7800f..8ecf5ed11 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
index a0f16f6b4..003518c18 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
index 45f318fb7..0ab3ee300 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
index c072cd018..471171339 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
index 951a7f701..9f99aa43d 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
index 42bd3ee57..b16cce7b8 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
index 4a8be3276..e74289b48 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
index 19cad8794..b9c1e631b 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
index bbae00266..b27c36eee 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
index 44bbe45b8..e0f9f1b73 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
index cbc0b4d3f..61d2e3ea3 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
index de5610f4f..1fcb6576d 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
index 616edccec..cd1c3754c 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
index 054048b49..10e03be41 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
index 8bfce0a9b..7cbb27c23 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
index 9d951cfad..10aaf9078 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
index 6e3ecf1ef..4dc6af26f 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
index 47553c4f9..f2c996ade 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
index e435ec726..5ded7103e 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
index e2d99fef7..8bf4aeeab 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
index bb1c31809..99eba4348 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
index 2b29df1e5..d3c5fb20f 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
index f8a980735..ca44c51ca 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
index 58443ed6b..140913db1 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
index 00b4ea432..e36b44acd 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
index 94ebd8053..f2cb943ca 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
index 47546409c..25a7807b6 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
index a781502ab..d05a48263 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
index aaae995a6..79477132d 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
index 4b1f8e299..75bca239f 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
index 0829e467b..2dbf6332c 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
index 4c3be8c8a..4bced9489 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
index 482b61025..19473fe6f 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
index 6f740a1a3..a4d64c1ea 100644
--- a/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
index 7c2cab163..b1a8a4830 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
index a07e2497a..05d4749f3 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
index 9c46bb944..140892b80 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
index 9a2775e2a..e2122cc8a 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
index c30073a19..bcb408f09 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
index 5481d9072..53e339bae 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
index 32a53d36f..b3db7f3ba 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
index 9348c2d24..ec158b109 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
index 19ec91f37..d37a7393d 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
index a55492edb..89b3e5aef 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
index fc4839d7a..d049f8ca1 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
index 15805db1f..4e6efdfbf 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
index e3a8b2388..3c4bcc35c 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
index e89057a51..37c6c7d9b 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
index 26049952a..8076314f7 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
index 7bc0c8c4a..478fbab08 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
index 2a297e774..46efb268d 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
index 1a75c1168..b0eee4572 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
index f917d1135..f27584d70 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
index 8fa09a13c..96c32dc3c 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
index 52005a875..e7cc2ad56 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
index e934bd681..f53de6705 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
index e74241652..dd208de02 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
index c2968d51b..02a087379 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
index 5d57e354b..a10f63ac7 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
index ddb7fab3a..07e15c066 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
index cece88df7..0bb045897 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
index 993caef1c..a39d2ff97 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
index 3c88a0134..5ccc397df 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
index bafbb54b5..6d7b5f542 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
index daa77d499..60143f398 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
index de0575c15..c558b3422 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
index 1297de080..764e71a7f 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
index dff5928e4..8b9b5ce8b 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
index 512f09d2d..07b99e7db 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
index e4eea7e2f..2e3bf75f1 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
index a84701cd2..600698c5a 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
index a9d0bd3ea..b87d04673 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
index 4467b881b..55760050a 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
index 8cf0c2208..07e984267 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
index 51e6c77e7..17acc1f50 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
index 8e9a53ed0..c0d316234 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
index 372aeb56f..5d77aaa5c 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
index 654d624ed..777d302f9 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
index 5b2d944ee..ae8fe0b8f 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
index 59d2c9105..9a849e5af 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
index 5ca35ffc9..cf39c66ed 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
index 66387b2d2..949025976 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
index c87d6372d..919a46bee 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
index 51bd15d67..7083f2d62 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
index 620e1df2e..a2c041f5f 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
index 7f4e41f03..4f2d22bcb 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
index 3f17a4644..682f0e24f 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
index 182ffce4d..4c221e5b0 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
index b892cde0c..178bca70f 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
index b1a4640bb..c8b367004 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
index 6f8ce9d98..69bf3ff10 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
index d95a31385..fb9fa1087 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
index 9edb097b5..8a670ae4b 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
index 417314c85..30fbc0b96 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
index c4c252675..8e07a6b6e 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
index 16d8c7c1f..24dd3bd67 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
index 6710a357e..f5cbb265f 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
index ee03d3099..528f44336 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
index 7ce662e12..8fe7abbc9 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
index 411a3a8b7..8890ead8a 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
index 707dcddbf..e91419c31 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
index d2747c6b4..1f1da4209 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
index 2bbb997b2..0bb057e9f 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
index 8e7f49c38..73d48c378 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
index be93c47a4..d36407a4e 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
index ccc7ea3b2..8ce3ef29d 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
index b5c799016..b6707b21a 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
index 50920ff35..18f5f914e 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
index 2ee50f8ba..cebec010c 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
index 64a5ffe2e..376e02980 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
index eda3c36be..3f3adecbd 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
index 7ebd06798..cbb907626 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
index 4fb8bb393..6720d624e 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
index 114514f42..08ef5ea09 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
index 25068111c..88c4e2b82 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
index 8906c767a..3ae213dc7 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
index bef40d81f..4b2e57996 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
index ad380c4bc..35cf9f739 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
index 215a53bc4..8a438ea74 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
index 40875ddc4..3950ee1d8 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
index 372b41ba3..5667625ae 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
index 226ac46b5..77ae3d654 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
index e695856b3..c9d4fd429 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
index 2cb51f681..26c02a7b4 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
index fa858f6d9..dcf6bc2fc 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
index 909c1b4a6..92bfebaae 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
index c4b2ef735..f4e9d4287 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
index be178fb08..48c0b23a2 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
index a79b76fdd..b541c62a5 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
index e1cc6dd73..d9489cc4c 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
index cca4659f2..44f83ac55 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
index ecf004e32..2b0fdd347 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
index 6a2f8a498..962f26195 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
index 56207a44e..a38d1fd28 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
index 85cd8498e..eb5403d18 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
index 2afc445b9..6dbf3ffba 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
index b63fb3886..4eb8dd404 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
index 0a65ff349..5d2540bcc 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
index 11711938d..246a2cfbf 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
index 99938731a..f79b75d5f 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
index 4cb19f884..fedf5785d 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
index d488e82c9..7ba9b161a 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
index 4cff9fa81..e5481c07b 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
index 8ccc68453..4a73cdebf 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
index 49d97e661..e81242df2 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
index f85ac3690..f85a3bda1 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
index b1949f3ec..96aa63346 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
index 1302ebe1d..6b3f9d6a4 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
index b7225c548..e33d0d61f 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
index baff85092..232b49548 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
index 817eee073..9346cbd34 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
index ddd1f3c35..8e64af429 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
index ea8b85808..78cd86a81 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
index 7efa32c1e..f21431289 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
index 2e5478d87..5e16f729a 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
index b6897fe2e..b805a21a7 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
index b6e1bbc61..2955f3d52 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
index ec11d0a25..4cebee02a 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
index 5dbfaabfb..5e881ee44 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
index dc5a462e9..003f72a48 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
index 53abbdaec..69d562727 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
index cf6886854..64decafd9 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
index a922b7a74..df1152c11 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
index d69afd217..b6004c75b 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
index 7bc1a66bd..d0a8dece5 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
index 0b821266e..f63798b45 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
index 9f98bd378..45e7638d4 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
index c05e36b81..026849fc6 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
index 6ab7a9f7a..de8959d62 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
index 170e552d5..1f2d20c4d 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
index 3ba963266..d2fc1141c 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
index 64c340776..98024238e 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
index 1084e1a47..17a1279b3 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
index 353517238..129eae82d 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
index 0d724a4d9..d2af7e8af 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
index 479d5fc79..5da25e8d1 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
index 1fbdd77c0..bb10d9eea 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
index 68d4a2324..ee5363951 100644
--- a/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
+++ b/packages/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Kokkos is licensed under 3-clause BSD terms of use:
diff --git a/packages/kokkos/core/src/impl/KokkosExp_Host_IterateTile.hpp b/packages/kokkos/core/src/impl/KokkosExp_Host_IterateTile.hpp
index d90aa0dd1..bdc3d59e1 100644
--- a/packages/kokkos/core/src/impl/KokkosExp_Host_IterateTile.hpp
+++ b/packages/kokkos/core/src/impl/KokkosExp_Host_IterateTile.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/KokkosExp_ViewMapping.hpp b/packages/kokkos/core/src/impl/KokkosExp_ViewMapping.hpp
index 0631ff052..9351bcd56 100644
--- a/packages/kokkos/core/src/impl/KokkosExp_ViewMapping.hpp
+++ b/packages/kokkos/core/src/impl/KokkosExp_ViewMapping.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_AnalyzePolicy.hpp b/packages/kokkos/core/src/impl/Kokkos_AnalyzePolicy.hpp
index 70b26836f..6cea1ed63 100644
--- a/packages/kokkos/core/src/impl/Kokkos_AnalyzePolicy.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_AnalyzePolicy.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Atomic_Assembly.hpp b/packages/kokkos/core/src/impl/Kokkos_Atomic_Assembly.hpp
index 2e400d5a0..ae95fd274 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Atomic_Assembly.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Atomic_Assembly.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Strong.hpp b/packages/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Strong.hpp
index b6228ea3b..dd6f6aa4c 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Strong.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Strong.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Weak.hpp b/packages/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Weak.hpp
index e4b5e1c8d..f947b80a5 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Weak.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Weak.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Atomic_Decrement.hpp b/packages/kokkos/core/src/impl/Kokkos_Atomic_Decrement.hpp
index dad3bd220..4940ed9c9 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Atomic_Decrement.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Atomic_Decrement.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Atomic_Exchange.hpp b/packages/kokkos/core/src/impl/Kokkos_Atomic_Exchange.hpp
index da442b809..11fa4dabb 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Atomic_Exchange.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Atomic_Exchange.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Add.hpp b/packages/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Add.hpp
index f1fe7fe73..fd78b853a 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Add.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Add.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Atomic_Fetch_And.hpp b/packages/kokkos/core/src/impl/Kokkos_Atomic_Fetch_And.hpp
index 46cc4628b..ca3467094 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Atomic_Fetch_And.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Atomic_Fetch_And.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Or.hpp b/packages/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Or.hpp
index 22330fc06..6801c6613 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Or.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Or.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Sub.hpp b/packages/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Sub.hpp
index 643b017da..316cef85a 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Sub.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Sub.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Atomic_Generic.hpp b/packages/kokkos/core/src/impl/Kokkos_Atomic_Generic.hpp
index c53392d64..a480df5b6 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Atomic_Generic.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Atomic_Generic.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Atomic_Increment.hpp b/packages/kokkos/core/src/impl/Kokkos_Atomic_Increment.hpp
index d900e2bfe..a0be9d975 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Atomic_Increment.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Atomic_Increment.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Atomic_Load.hpp b/packages/kokkos/core/src/impl/Kokkos_Atomic_Load.hpp
index 3ae01290d..9eb9b874a 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Atomic_Load.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Atomic_Load.hpp
@@ -2,10 +2,10 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
+// Kokkos v. 3.0
// Copyright (2019) Sandia Corporation
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Atomic_Memory_Order.hpp b/packages/kokkos/core/src/impl/Kokkos_Atomic_Memory_Order.hpp
index b8284f739..84a5b70ac 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Atomic_Memory_Order.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Atomic_Memory_Order.hpp
@@ -2,10 +2,10 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
+// Kokkos v. 3.0
// Copyright (2019) Sandia Corporation
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Atomic_Store.hpp b/packages/kokkos/core/src/impl/Kokkos_Atomic_Store.hpp
index 08d8c164f..7d2aaf117 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Atomic_Store.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Atomic_Store.hpp
@@ -2,10 +2,10 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
+// Kokkos v. 3.0
// Copyright (2019) Sandia Corporation
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Atomic_View.hpp b/packages/kokkos/core/src/impl/Kokkos_Atomic_View.hpp
index d76457ab8..dbb7445f3 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Atomic_View.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Atomic_View.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Atomic_Windows.hpp b/packages/kokkos/core/src/impl/Kokkos_Atomic_Windows.hpp
index d167320ea..5d2e0a7a9 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Atomic_Windows.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Atomic_Windows.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_BitOps.hpp b/packages/kokkos/core/src/impl/Kokkos_BitOps.hpp
index 8acc86eb3..9ffd155c5 100644
--- a/packages/kokkos/core/src/impl/Kokkos_BitOps.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_BitOps.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_CPUDiscovery.cpp b/packages/kokkos/core/src/impl/Kokkos_CPUDiscovery.cpp
index 9b41654f8..2fb733df3 100644
--- a/packages/kokkos/core/src/impl/Kokkos_CPUDiscovery.cpp
+++ b/packages/kokkos/core/src/impl/Kokkos_CPUDiscovery.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_CPUDiscovery.hpp b/packages/kokkos/core/src/impl/Kokkos_CPUDiscovery.hpp
index 69a29f488..b20edfa6f 100644
--- a/packages/kokkos/core/src/impl/Kokkos_CPUDiscovery.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_CPUDiscovery.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_ChaseLev.hpp b/packages/kokkos/core/src/impl/Kokkos_ChaseLev.hpp
index cc8790bf5..6826d1b88 100644
--- a/packages/kokkos/core/src/impl/Kokkos_ChaseLev.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_ChaseLev.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_ClockTic.hpp b/packages/kokkos/core/src/impl/Kokkos_ClockTic.hpp
index cf54cfa41..50e81e50e 100644
--- a/packages/kokkos/core/src/impl/Kokkos_ClockTic.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_ClockTic.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_ConcurrentBitset.hpp b/packages/kokkos/core/src/impl/Kokkos_ConcurrentBitset.hpp
index 3e1411b3e..e4f8b69c4 100644
--- a/packages/kokkos/core/src/impl/Kokkos_ConcurrentBitset.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_ConcurrentBitset.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Core.cpp b/packages/kokkos/core/src/impl/Kokkos_Core.cpp
index c20a72e7e..c9557798b 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Core.cpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Core.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_EBO.hpp b/packages/kokkos/core/src/impl/Kokkos_EBO.hpp
index 833c0060d..fbdaa9d4d 100644
--- a/packages/kokkos/core/src/impl/Kokkos_EBO.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_EBO.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Error.cpp b/packages/kokkos/core/src/impl/Kokkos_Error.cpp
index 5c63f7e7c..f456fe756 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Error.cpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Error.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Error.hpp b/packages/kokkos/core/src/impl/Kokkos_Error.hpp
index f2e28b381..7bfb961aa 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Error.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Error.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_ExecPolicy.cpp b/packages/kokkos/core/src/impl/Kokkos_ExecPolicy.cpp
index 6a46792d7..0da83f242 100644
--- a/packages/kokkos/core/src/impl/Kokkos_ExecPolicy.cpp
+++ b/packages/kokkos/core/src/impl/Kokkos_ExecPolicy.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_FixedBufferMemoryPool.hpp b/packages/kokkos/core/src/impl/Kokkos_FixedBufferMemoryPool.hpp
index c25fe07fc..8d588d341 100644
--- a/packages/kokkos/core/src/impl/Kokkos_FixedBufferMemoryPool.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_FixedBufferMemoryPool.hpp
@@ -2,10 +2,10 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
+// Kokkos v. 3.0
// Copyright (2019) Sandia Corporation
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_FunctorAdapter.hpp b/packages/kokkos/core/src/impl/Kokkos_FunctorAdapter.hpp
index 91672aecf..7ff2da461 100644
--- a/packages/kokkos/core/src/impl/Kokkos_FunctorAdapter.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_FunctorAdapter.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_FunctorAnalysis.hpp b/packages/kokkos/core/src/impl/Kokkos_FunctorAnalysis.hpp
index 867aab079..1cc1a2545 100644
--- a/packages/kokkos/core/src/impl/Kokkos_FunctorAnalysis.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_FunctorAnalysis.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_HBWSpace.cpp b/packages/kokkos/core/src/impl/Kokkos_HBWSpace.cpp
index 44558e441..28318d652 100644
--- a/packages/kokkos/core/src/impl/Kokkos_HBWSpace.cpp
+++ b/packages/kokkos/core/src/impl/Kokkos_HBWSpace.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_HostBarrier.cpp b/packages/kokkos/core/src/impl/Kokkos_HostBarrier.cpp
index d1aa64f46..eb0a6df7a 100644
--- a/packages/kokkos/core/src/impl/Kokkos_HostBarrier.cpp
+++ b/packages/kokkos/core/src/impl/Kokkos_HostBarrier.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_HostBarrier.hpp b/packages/kokkos/core/src/impl/Kokkos_HostBarrier.hpp
index 18d41dd4a..14a53f323 100644
--- a/packages/kokkos/core/src/impl/Kokkos_HostBarrier.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_HostBarrier.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_HostSpace.cpp b/packages/kokkos/core/src/impl/Kokkos_HostSpace.cpp
index 4e967bcbd..e77736ddb 100644
--- a/packages/kokkos/core/src/impl/Kokkos_HostSpace.cpp
+++ b/packages/kokkos/core/src/impl/Kokkos_HostSpace.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.cpp b/packages/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.cpp
index d04ab78d8..e5bb2b369 100644
--- a/packages/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.cpp
+++ b/packages/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.hpp b/packages/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.hpp
index 22c990d1b..f04b1721b 100644
--- a/packages/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_HostThreadTeam.cpp b/packages/kokkos/core/src/impl/Kokkos_HostThreadTeam.cpp
index 157c3bfcf..62673fee0 100644
--- a/packages/kokkos/core/src/impl/Kokkos_HostThreadTeam.cpp
+++ b/packages/kokkos/core/src/impl/Kokkos_HostThreadTeam.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_HostThreadTeam.hpp b/packages/kokkos/core/src/impl/Kokkos_HostThreadTeam.hpp
index 1ca454452..b48b53caf 100644
--- a/packages/kokkos/core/src/impl/Kokkos_HostThreadTeam.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_HostThreadTeam.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_LIFO.hpp b/packages/kokkos/core/src/impl/Kokkos_LIFO.hpp
index 36a7204df..e6a5e1958 100644
--- a/packages/kokkos/core/src/impl/Kokkos_LIFO.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_LIFO.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_LinkedListNode.hpp b/packages/kokkos/core/src/impl/Kokkos_LinkedListNode.hpp
index d318e5836..2a49f5e02 100644
--- a/packages/kokkos/core/src/impl/Kokkos_LinkedListNode.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_LinkedListNode.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_MemoryPool.cpp b/packages/kokkos/core/src/impl/Kokkos_MemoryPool.cpp
index 0281c55cd..f6a61aec2 100644
--- a/packages/kokkos/core/src/impl/Kokkos_MemoryPool.cpp
+++ b/packages/kokkos/core/src/impl/Kokkos_MemoryPool.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_MemoryPoolAllocator.hpp b/packages/kokkos/core/src/impl/Kokkos_MemoryPoolAllocator.hpp
index 3bcaab769..e57581797 100644
--- a/packages/kokkos/core/src/impl/Kokkos_MemoryPoolAllocator.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_MemoryPoolAllocator.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_MemorySpace.hpp b/packages/kokkos/core/src/impl/Kokkos_MemorySpace.hpp
index 5b82b084f..8054bf0d8 100644
--- a/packages/kokkos/core/src/impl/Kokkos_MemorySpace.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_MemorySpace.hpp
@@ -2,10 +2,10 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
+// Kokkos v. 3.0
// Copyright (2019) Sandia Corporation
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp b/packages/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp
index 2d61a3ede..2c975aea8 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_MultipleTaskQueue.hpp b/packages/kokkos/core/src/impl/Kokkos_MultipleTaskQueue.hpp
index 1956f734f..a3b792722 100644
--- a/packages/kokkos/core/src/impl/Kokkos_MultipleTaskQueue.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_MultipleTaskQueue.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_OldMacros.hpp b/packages/kokkos/core/src/impl/Kokkos_OldMacros.hpp
index 2fe68caf0..d3de3861b 100644
--- a/packages/kokkos/core/src/impl/Kokkos_OldMacros.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_OldMacros.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_OptionalRef.hpp b/packages/kokkos/core/src/impl/Kokkos_OptionalRef.hpp
index 36c74329c..35635d31d 100644
--- a/packages/kokkos/core/src/impl/Kokkos_OptionalRef.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_OptionalRef.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_PhysicalLayout.hpp b/packages/kokkos/core/src/impl/Kokkos_PhysicalLayout.hpp
index 79cb93f17..63713a9c6 100644
--- a/packages/kokkos/core/src/impl/Kokkos_PhysicalLayout.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_PhysicalLayout.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Profiling_DeviceInfo.hpp b/packages/kokkos/core/src/impl/Kokkos_Profiling_DeviceInfo.hpp
index b0d03dd79..e3b8997df 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Profiling_DeviceInfo.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Profiling_DeviceInfo.hpp
@@ -1,44 +1,45 @@
/*
- //@HEADER
- // ************************************************************************
- //
- // Kokkos v. 2.0
- // Copyright (2014) Sandia Corporation
- //
- // Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
- // the U.S. Government retains certain rights in this software.
- //
- // Redistribution and use in source and binary forms, with or without
- // modification, are permitted provided that the following conditions are
- // met:
- //
- // 1. Redistributions of source code must retain the above copyright
- // notice, this list of conditions and the following disclaimer.
- //
- // 2. Redistributions in binary form must reproduce the above copyright
- // notice, this list of conditions and the following disclaimer in the
- // documentation and/or other materials provided with the distribution.
- //
- // 3. Neither the name of the Corporation nor the names of the
- // contributors may be used to endorse or promote products derived from
- // this software without specific prior written permission.
- //
- // THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
- // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- // IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- // PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE
- // CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- // EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- // PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- // PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- // LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- //
- // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
- //
- // ************************************************************************
- //@HEADER
+//@HEADER
+// ************************************************************************
+//
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
*/
#ifndef KOKKOSP_DEVICE_INFO_HPP
diff --git a/packages/kokkos/core/src/impl/Kokkos_Profiling_Interface.cpp b/packages/kokkos/core/src/impl/Kokkos_Profiling_Interface.cpp
index 292febfa9..c071a9ae6 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Profiling_Interface.cpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Profiling_Interface.cpp
@@ -1,45 +1,46 @@
/*
- //@HEADER
- // ************************************************************************
- //
- // Kokkos v. 2.0
- // Copyright (2014) Sandia Corporation
- //
- // Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
- // the U.S. Government retains certain rights in this software.
- //
- // Redistribution and use in source and binary forms, with or without
- // modification, are permitted provided that the following conditions are
- // met:
- //
- // 1. Redistributions of source code must retain the above copyright
- // notice, this list of conditions and the following disclaimer.
- //
- // 2. Redistributions in binary form must reproduce the above copyright
- // notice, this list of conditions and the following disclaimer in the
- // documentation and/or other materials provided with the distribution.
- //
- // 3. Neither the name of the Corporation nor the names of the
- // contributors may be used to endorse or promote products derived from
- // this software without specific prior written permission.
- //
- // THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
- // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- // IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- // PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE
- // CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- // EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- // PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- // PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- // LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- //
- // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
- //
- // ************************************************************************
- //@HEADER
- */
+//@HEADER
+// ************************************************************************
+//
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
#include <Kokkos_Macros.hpp>
diff --git a/packages/kokkos/core/src/impl/Kokkos_Profiling_Interface.hpp b/packages/kokkos/core/src/impl/Kokkos_Profiling_Interface.hpp
index e32300249..12296ece1 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Profiling_Interface.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Profiling_Interface.hpp
@@ -1,45 +1,46 @@
/*
- //@HEADER
- // ************************************************************************
- //
- // Kokkos v. 2.0
- // Copyright (2014) Sandia Corporation
- //
- // Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
- // the U.S. Government retains certain rights in this software.
- //
- // Redistribution and use in source and binary forms, with or without
- // modification, are permitted provided that the following conditions are
- // met:
- //
- // 1. Redistributions of source code must retain the above copyright
- // notice, this list of conditions and the following disclaimer.
- //
- // 2. Redistributions in binary form must reproduce the above copyright
- // notice, this list of conditions and the following disclaimer in the
- // documentation and/or other materials provided with the distribution.
- //
- // 3. Neither the name of the Corporation nor the names of the
- // contributors may be used to endorse or promote products derived from
- // this software without specific prior written permission.
- //
- // THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
- // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- // IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- // PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE
- // CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- // EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- // PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- // PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- // LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- //
- // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
- //
- // ************************************************************************
- //@HEADER
- */
+//@HEADER
+// ************************************************************************
+//
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
#ifndef KOKKOSP_INTERFACE_HPP
#define KOKKOSP_INTERFACE_HPP
diff --git a/packages/kokkos/core/src/impl/Kokkos_Serial.cpp b/packages/kokkos/core/src/impl/Kokkos_Serial.cpp
index 4197622d9..f4a2fabd3 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Serial.cpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Serial.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Serial_Task.cpp b/packages/kokkos/core/src/impl/Kokkos_Serial_Task.cpp
index 5fd95395c..a592cee05 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Serial_Task.cpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Serial_Task.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Serial_Task.hpp b/packages/kokkos/core/src/impl/Kokkos_Serial_Task.hpp
index b0ca9d02d..07c53a418 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Serial_Task.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Serial_Task.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Serial_WorkGraphPolicy.hpp b/packages/kokkos/core/src/impl/Kokkos_Serial_WorkGraphPolicy.hpp
index 5b4c7ef25..be2b2ecd7 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Serial_WorkGraphPolicy.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Serial_WorkGraphPolicy.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_SharedAlloc.cpp b/packages/kokkos/core/src/impl/Kokkos_SharedAlloc.cpp
index c3b8ca20b..349d0928e 100644
--- a/packages/kokkos/core/src/impl/Kokkos_SharedAlloc.cpp
+++ b/packages/kokkos/core/src/impl/Kokkos_SharedAlloc.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_SharedAlloc.hpp b/packages/kokkos/core/src/impl/Kokkos_SharedAlloc.hpp
index 7cd83222e..ebdaaec10 100644
--- a/packages/kokkos/core/src/impl/Kokkos_SharedAlloc.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_SharedAlloc.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_SimpleTaskScheduler.hpp b/packages/kokkos/core/src/impl/Kokkos_SimpleTaskScheduler.hpp
index 1c709ead3..18d007835 100644
--- a/packages/kokkos/core/src/impl/Kokkos_SimpleTaskScheduler.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_SimpleTaskScheduler.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_SingleTaskQueue.hpp b/packages/kokkos/core/src/impl/Kokkos_SingleTaskQueue.hpp
index bde6d1c8e..daf4ca9bc 100644
--- a/packages/kokkos/core/src/impl/Kokkos_SingleTaskQueue.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_SingleTaskQueue.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Spinwait.cpp b/packages/kokkos/core/src/impl/Kokkos_Spinwait.cpp
index 3cc7f97cf..57939a56f 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Spinwait.cpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Spinwait.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Spinwait.hpp b/packages/kokkos/core/src/impl/Kokkos_Spinwait.hpp
index 5f77c573f..0200fcf85 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Spinwait.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Spinwait.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Tags.hpp b/packages/kokkos/core/src/impl/Kokkos_Tags.hpp
index 8d4510dc5..078ba58f5 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Tags.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Tags.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_TaskBase.hpp b/packages/kokkos/core/src/impl/Kokkos_TaskBase.hpp
index 671ab3ebc..122fe652b 100644
--- a/packages/kokkos/core/src/impl/Kokkos_TaskBase.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_TaskBase.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_TaskNode.hpp b/packages/kokkos/core/src/impl/Kokkos_TaskNode.hpp
index 57f807217..627ee418e 100644
--- a/packages/kokkos/core/src/impl/Kokkos_TaskNode.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_TaskNode.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_TaskPolicyData.hpp b/packages/kokkos/core/src/impl/Kokkos_TaskPolicyData.hpp
index bc02d682d..61c5cb49e 100644
--- a/packages/kokkos/core/src/impl/Kokkos_TaskPolicyData.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_TaskPolicyData.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_TaskQueue.hpp b/packages/kokkos/core/src/impl/Kokkos_TaskQueue.hpp
index 3b0343fe9..014992afb 100644
--- a/packages/kokkos/core/src/impl/Kokkos_TaskQueue.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_TaskQueue.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_TaskQueueCommon.hpp b/packages/kokkos/core/src/impl/Kokkos_TaskQueueCommon.hpp
index 7671e1c5c..1598a7902 100644
--- a/packages/kokkos/core/src/impl/Kokkos_TaskQueueCommon.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_TaskQueueCommon.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_TaskQueueMemoryManager.hpp b/packages/kokkos/core/src/impl/Kokkos_TaskQueueMemoryManager.hpp
index ac342ccbd..21e892d4c 100644
--- a/packages/kokkos/core/src/impl/Kokkos_TaskQueueMemoryManager.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_TaskQueueMemoryManager.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_TaskQueueMultiple.hpp b/packages/kokkos/core/src/impl/Kokkos_TaskQueueMultiple.hpp
index aaacb1435..4a81e2766 100644
--- a/packages/kokkos/core/src/impl/Kokkos_TaskQueueMultiple.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_TaskQueueMultiple.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_TaskQueueMultiple_impl.hpp b/packages/kokkos/core/src/impl/Kokkos_TaskQueueMultiple_impl.hpp
index 1733d096e..b40356a2b 100644
--- a/packages/kokkos/core/src/impl/Kokkos_TaskQueueMultiple_impl.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_TaskQueueMultiple_impl.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_TaskQueue_impl.hpp b/packages/kokkos/core/src/impl/Kokkos_TaskQueue_impl.hpp
index 88de70e4e..cdcc75bdf 100644
--- a/packages/kokkos/core/src/impl/Kokkos_TaskQueue_impl.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_TaskQueue_impl.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_TaskResult.hpp b/packages/kokkos/core/src/impl/Kokkos_TaskResult.hpp
index 483fc2e45..bffc6b660 100644
--- a/packages/kokkos/core/src/impl/Kokkos_TaskResult.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_TaskResult.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_TaskTeamMember.hpp b/packages/kokkos/core/src/impl/Kokkos_TaskTeamMember.hpp
index d9aa7bd75..3f32fc949 100644
--- a/packages/kokkos/core/src/impl/Kokkos_TaskTeamMember.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_TaskTeamMember.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Timer.hpp b/packages/kokkos/core/src/impl/Kokkos_Timer.hpp
index 72efb714e..60ec0ead8 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Timer.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Timer.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Traits.hpp b/packages/kokkos/core/src/impl/Kokkos_Traits.hpp
index 2a6f9bfec..b9b446660 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Traits.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Traits.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Utilities.hpp b/packages/kokkos/core/src/impl/Kokkos_Utilities.hpp
index ef2fbdae0..a4b49aa1f 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Utilities.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Utilities.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_VLAEmulation.hpp b/packages/kokkos/core/src/impl/Kokkos_VLAEmulation.hpp
index 062dc4aa6..31c60d3ba 100644
--- a/packages/kokkos/core/src/impl/Kokkos_VLAEmulation.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_VLAEmulation.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_ViewArray.hpp b/packages/kokkos/core/src/impl/Kokkos_ViewArray.hpp
index 60ab15448..752c91f3c 100644
--- a/packages/kokkos/core/src/impl/Kokkos_ViewArray.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_ViewArray.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_ViewCtor.hpp b/packages/kokkos/core/src/impl/Kokkos_ViewCtor.hpp
index 331bea2e8..3eb9179cc 100644
--- a/packages/kokkos/core/src/impl/Kokkos_ViewCtor.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_ViewCtor.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_ViewFillCopyETIAvail.hpp b/packages/kokkos/core/src/impl/Kokkos_ViewFillCopyETIAvail.hpp
index 2b391440c..720a36564 100644
--- a/packages/kokkos/core/src/impl/Kokkos_ViewFillCopyETIAvail.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_ViewFillCopyETIAvail.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_ViewFillCopyETIDecl.hpp b/packages/kokkos/core/src/impl/Kokkos_ViewFillCopyETIDecl.hpp
index bcd31d457..f61dece0c 100644
--- a/packages/kokkos/core/src/impl/Kokkos_ViewFillCopyETIDecl.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_ViewFillCopyETIDecl.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_ViewLayoutTiled.hpp b/packages/kokkos/core/src/impl/Kokkos_ViewLayoutTiled.hpp
index b31334a12..9d79b4db9 100644
--- a/packages/kokkos/core/src/impl/Kokkos_ViewLayoutTiled.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_ViewLayoutTiled.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_ViewMapping.hpp b/packages/kokkos/core/src/impl/Kokkos_ViewMapping.hpp
index 6abbcd342..bdfd7faae 100644
--- a/packages/kokkos/core/src/impl/Kokkos_ViewMapping.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_ViewMapping.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_ViewTile.hpp b/packages/kokkos/core/src/impl/Kokkos_ViewTile.hpp
index 8a84c4a6b..7e6f1b1ae 100644
--- a/packages/kokkos/core/src/impl/Kokkos_ViewTile.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_ViewTile.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_ViewUniformType.hpp b/packages/kokkos/core/src/impl/Kokkos_ViewUniformType.hpp
index 01e7a713d..feb1b8f2f 100644
--- a/packages/kokkos/core/src/impl/Kokkos_ViewUniformType.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_ViewUniformType.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_Volatile_Load.hpp b/packages/kokkos/core/src/impl/Kokkos_Volatile_Load.hpp
index 32213d5c9..b3c4233b9 100644
--- a/packages/kokkos/core/src/impl/Kokkos_Volatile_Load.hpp
+++ b/packages/kokkos/core/src/impl/Kokkos_Volatile_Load.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/impl/Kokkos_hwloc.cpp b/packages/kokkos/core/src/impl/Kokkos_hwloc.cpp
index 2ca5d413a..3e1a698a9 100644
--- a/packages/kokkos/core/src/impl/Kokkos_hwloc.cpp
+++ b/packages/kokkos/core/src/impl/Kokkos_hwloc.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/src/kokkos.pc.in b/packages/kokkos/core/src/kokkos.pc.in
index f225493fa..191dd7a4f 100644
--- a/packages/kokkos/core/src/kokkos.pc.in
+++ b/packages/kokkos/core/src/kokkos.pc.in
@@ -1,8 +1,9 @@
#
-# Kokkos v. 2.0
-# Copyright (2014) Sandia Corporation
+# Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
#
-# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+# Under the terms of Contract DE-NA0003525 with NTESS,
# the U.S. Government retains certain rights in this software.
#
# Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestAggregate.hpp b/packages/kokkos/core/unit_test/TestAggregate.hpp
index c69700bb7..2aab19cfa 100644
--- a/packages/kokkos/core/unit_test/TestAggregate.hpp
+++ b/packages/kokkos/core/unit_test/TestAggregate.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestAtomic.hpp b/packages/kokkos/core/unit_test/TestAtomic.hpp
index cbb8a5cd3..f8ed85c28 100644
--- a/packages/kokkos/core/unit_test/TestAtomic.hpp
+++ b/packages/kokkos/core/unit_test/TestAtomic.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestAtomicOperations.hpp b/packages/kokkos/core/unit_test/TestAtomicOperations.hpp
index 16f8e1950..e9852e2f0 100644
--- a/packages/kokkos/core/unit_test/TestAtomicOperations.hpp
+++ b/packages/kokkos/core/unit_test/TestAtomicOperations.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestAtomicOperations_complexdouble.hpp b/packages/kokkos/core/unit_test/TestAtomicOperations_complexdouble.hpp
index 9f7de276b..a50da3670 100644
--- a/packages/kokkos/core/unit_test/TestAtomicOperations_complexdouble.hpp
+++ b/packages/kokkos/core/unit_test/TestAtomicOperations_complexdouble.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestAtomicOperations_complexfloat.hpp b/packages/kokkos/core/unit_test/TestAtomicOperations_complexfloat.hpp
index 00dfbcf52..bb8c5752b 100644
--- a/packages/kokkos/core/unit_test/TestAtomicOperations_complexfloat.hpp
+++ b/packages/kokkos/core/unit_test/TestAtomicOperations_complexfloat.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestAtomicOperations_double.hpp b/packages/kokkos/core/unit_test/TestAtomicOperations_double.hpp
index 8913f1e54..fd6ac6e4d 100644
--- a/packages/kokkos/core/unit_test/TestAtomicOperations_double.hpp
+++ b/packages/kokkos/core/unit_test/TestAtomicOperations_double.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestAtomicOperations_float.hpp b/packages/kokkos/core/unit_test/TestAtomicOperations_float.hpp
index 1fc16b1f0..f12275ef4 100644
--- a/packages/kokkos/core/unit_test/TestAtomicOperations_float.hpp
+++ b/packages/kokkos/core/unit_test/TestAtomicOperations_float.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestAtomicOperations_int.hpp b/packages/kokkos/core/unit_test/TestAtomicOperations_int.hpp
index 23d23237e..6b14635d6 100644
--- a/packages/kokkos/core/unit_test/TestAtomicOperations_int.hpp
+++ b/packages/kokkos/core/unit_test/TestAtomicOperations_int.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestAtomicOperations_longint.hpp b/packages/kokkos/core/unit_test/TestAtomicOperations_longint.hpp
index 609af3ce3..39703f137 100644
--- a/packages/kokkos/core/unit_test/TestAtomicOperations_longint.hpp
+++ b/packages/kokkos/core/unit_test/TestAtomicOperations_longint.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestAtomicOperations_longlongint.hpp b/packages/kokkos/core/unit_test/TestAtomicOperations_longlongint.hpp
index cdb148f66..5bbc9539e 100644
--- a/packages/kokkos/core/unit_test/TestAtomicOperations_longlongint.hpp
+++ b/packages/kokkos/core/unit_test/TestAtomicOperations_longlongint.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestAtomicOperations_unsignedint.hpp b/packages/kokkos/core/unit_test/TestAtomicOperations_unsignedint.hpp
index 4ac698118..0c92eb319 100644
--- a/packages/kokkos/core/unit_test/TestAtomicOperations_unsignedint.hpp
+++ b/packages/kokkos/core/unit_test/TestAtomicOperations_unsignedint.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestAtomicOperations_unsignedlongint.hpp b/packages/kokkos/core/unit_test/TestAtomicOperations_unsignedlongint.hpp
index 5190b7965..11e4bf66f 100644
--- a/packages/kokkos/core/unit_test/TestAtomicOperations_unsignedlongint.hpp
+++ b/packages/kokkos/core/unit_test/TestAtomicOperations_unsignedlongint.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestAtomicViews.hpp b/packages/kokkos/core/unit_test/TestAtomicViews.hpp
index e0ca7bbae..2a629d970 100644
--- a/packages/kokkos/core/unit_test/TestAtomicViews.hpp
+++ b/packages/kokkos/core/unit_test/TestAtomicViews.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestCXX11.hpp b/packages/kokkos/core/unit_test/TestCXX11.hpp
index e09b9093f..909ba1a92 100644
--- a/packages/kokkos/core/unit_test/TestCXX11.hpp
+++ b/packages/kokkos/core/unit_test/TestCXX11.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestCXX11Deduction.hpp b/packages/kokkos/core/unit_test/TestCXX11Deduction.hpp
index e0dc5b390..16c89bba8 100644
--- a/packages/kokkos/core/unit_test/TestCXX11Deduction.hpp
+++ b/packages/kokkos/core/unit_test/TestCXX11Deduction.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestCompilerMacros.hpp b/packages/kokkos/core/unit_test/TestCompilerMacros.hpp
index 3ef8c2824..d247d7469 100644
--- a/packages/kokkos/core/unit_test/TestCompilerMacros.hpp
+++ b/packages/kokkos/core/unit_test/TestCompilerMacros.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestComplex.hpp b/packages/kokkos/core/unit_test/TestComplex.hpp
index 4be2a45bc..f441085c6 100644
--- a/packages/kokkos/core/unit_test/TestComplex.hpp
+++ b/packages/kokkos/core/unit_test/TestComplex.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestConcurrentBitset.hpp b/packages/kokkos/core/unit_test/TestConcurrentBitset.hpp
index e3cae56e5..3a8e7f5e3 100644
--- a/packages/kokkos/core/unit_test/TestConcurrentBitset.hpp
+++ b/packages/kokkos/core/unit_test/TestConcurrentBitset.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestCrs.hpp b/packages/kokkos/core/unit_test/TestCrs.hpp
index ccd7caa33..e0d6f3b45 100644
--- a/packages/kokkos/core/unit_test/TestCrs.hpp
+++ b/packages/kokkos/core/unit_test/TestCrs.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestDefaultDeviceTypeInit.hpp b/packages/kokkos/core/unit_test/TestDefaultDeviceTypeInit.hpp
index 07e56b667..0448db157 100644
--- a/packages/kokkos/core/unit_test/TestDefaultDeviceTypeInit.hpp
+++ b/packages/kokkos/core/unit_test/TestDefaultDeviceTypeInit.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestFunctorAnalysis.hpp b/packages/kokkos/core/unit_test/TestFunctorAnalysis.hpp
index 84293a46b..2025ef2bb 100644
--- a/packages/kokkos/core/unit_test/TestFunctorAnalysis.hpp
+++ b/packages/kokkos/core/unit_test/TestFunctorAnalysis.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestHWLOC.cpp b/packages/kokkos/core/unit_test/TestHWLOC.cpp
index b37a840e0..0f060c139 100644
--- a/packages/kokkos/core/unit_test/TestHWLOC.cpp
+++ b/packages/kokkos/core/unit_test/TestHWLOC.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestInit.hpp b/packages/kokkos/core/unit_test/TestInit.hpp
index 62f41bea3..ee75c7435 100644
--- a/packages/kokkos/core/unit_test/TestInit.hpp
+++ b/packages/kokkos/core/unit_test/TestInit.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestLocalDeepCopy.hpp b/packages/kokkos/core/unit_test/TestLocalDeepCopy.hpp
index c3d918a87..7d7b18be8 100644
--- a/packages/kokkos/core/unit_test/TestLocalDeepCopy.hpp
+++ b/packages/kokkos/core/unit_test/TestLocalDeepCopy.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestMDRange.hpp b/packages/kokkos/core/unit_test/TestMDRange.hpp
index dc857514c..b085f0fa0 100644
--- a/packages/kokkos/core/unit_test/TestMDRange.hpp
+++ b/packages/kokkos/core/unit_test/TestMDRange.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestMDRange_a.hpp b/packages/kokkos/core/unit_test/TestMDRange_a.hpp
index 03636b5cc..de7b4540a 100644
--- a/packages/kokkos/core/unit_test/TestMDRange_a.hpp
+++ b/packages/kokkos/core/unit_test/TestMDRange_a.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestMDRange_b.hpp b/packages/kokkos/core/unit_test/TestMDRange_b.hpp
index 38962de18..f89761bbf 100644
--- a/packages/kokkos/core/unit_test/TestMDRange_b.hpp
+++ b/packages/kokkos/core/unit_test/TestMDRange_b.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestMDRange_c.hpp b/packages/kokkos/core/unit_test/TestMDRange_c.hpp
index 5792774e9..4e3b482aa 100644
--- a/packages/kokkos/core/unit_test/TestMDRange_c.hpp
+++ b/packages/kokkos/core/unit_test/TestMDRange_c.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestMDRange_d.hpp b/packages/kokkos/core/unit_test/TestMDRange_d.hpp
index acea92ef1..394f7f82b 100644
--- a/packages/kokkos/core/unit_test/TestMDRange_d.hpp
+++ b/packages/kokkos/core/unit_test/TestMDRange_d.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestMDRange_e.hpp b/packages/kokkos/core/unit_test/TestMDRange_e.hpp
index 91a4e426b..e092bd204 100644
--- a/packages/kokkos/core/unit_test/TestMDRange_e.hpp
+++ b/packages/kokkos/core/unit_test/TestMDRange_e.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestMemoryPool.hpp b/packages/kokkos/core/unit_test/TestMemoryPool.hpp
index 5b495f56e..968d6bc25 100644
--- a/packages/kokkos/core/unit_test/TestMemoryPool.hpp
+++ b/packages/kokkos/core/unit_test/TestMemoryPool.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestPolicyConstruction.hpp b/packages/kokkos/core/unit_test/TestPolicyConstruction.hpp
index 137ceedf4..52d948762 100644
--- a/packages/kokkos/core/unit_test/TestPolicyConstruction.hpp
+++ b/packages/kokkos/core/unit_test/TestPolicyConstruction.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestRange.hpp b/packages/kokkos/core/unit_test/TestRange.hpp
index ce29e9632..fb64ae52e 100644
--- a/packages/kokkos/core/unit_test/TestRange.hpp
+++ b/packages/kokkos/core/unit_test/TestRange.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestReduce.hpp b/packages/kokkos/core/unit_test/TestReduce.hpp
index caba52755..a0ca88220 100644
--- a/packages/kokkos/core/unit_test/TestReduce.hpp
+++ b/packages/kokkos/core/unit_test/TestReduce.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestReduceCombinatorical.hpp b/packages/kokkos/core/unit_test/TestReduceCombinatorical.hpp
index 0f1eb7a7a..c785ac7e4 100644
--- a/packages/kokkos/core/unit_test/TestReduceCombinatorical.hpp
+++ b/packages/kokkos/core/unit_test/TestReduceCombinatorical.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestReducers.hpp b/packages/kokkos/core/unit_test/TestReducers.hpp
index 995ea80f0..28d8286b9 100644
--- a/packages/kokkos/core/unit_test/TestReducers.hpp
+++ b/packages/kokkos/core/unit_test/TestReducers.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestReducers_a.hpp b/packages/kokkos/core/unit_test/TestReducers_a.hpp
index dc06c0af8..4bef1d462 100644
--- a/packages/kokkos/core/unit_test/TestReducers_a.hpp
+++ b/packages/kokkos/core/unit_test/TestReducers_a.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestReducers_b.hpp b/packages/kokkos/core/unit_test/TestReducers_b.hpp
index 3e47bf033..44ed45822 100644
--- a/packages/kokkos/core/unit_test/TestReducers_b.hpp
+++ b/packages/kokkos/core/unit_test/TestReducers_b.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestReducers_c.hpp b/packages/kokkos/core/unit_test/TestReducers_c.hpp
index fcd24e23b..eef77a12b 100644
--- a/packages/kokkos/core/unit_test/TestReducers_c.hpp
+++ b/packages/kokkos/core/unit_test/TestReducers_c.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestReducers_d.hpp b/packages/kokkos/core/unit_test/TestReducers_d.hpp
index d8c9268f1..3d92aca9d 100644
--- a/packages/kokkos/core/unit_test/TestReducers_d.hpp
+++ b/packages/kokkos/core/unit_test/TestReducers_d.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestResize.hpp b/packages/kokkos/core/unit_test/TestResize.hpp
index 40bc4f6b7..aab939cbc 100644
--- a/packages/kokkos/core/unit_test/TestResize.hpp
+++ b/packages/kokkos/core/unit_test/TestResize.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestScan.hpp b/packages/kokkos/core/unit_test/TestScan.hpp
index b92dd9d15..8721adfef 100644
--- a/packages/kokkos/core/unit_test/TestScan.hpp
+++ b/packages/kokkos/core/unit_test/TestScan.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestSharedAlloc.hpp b/packages/kokkos/core/unit_test/TestSharedAlloc.hpp
index 95c600b8d..59e779ae6 100644
--- a/packages/kokkos/core/unit_test/TestSharedAlloc.hpp
+++ b/packages/kokkos/core/unit_test/TestSharedAlloc.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestStackTrace.cpp b/packages/kokkos/core/unit_test/TestStackTrace.cpp
index be0c822a3..81e5527ff 100644
--- a/packages/kokkos/core/unit_test/TestStackTrace.cpp
+++ b/packages/kokkos/core/unit_test/TestStackTrace.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestStackTrace.hpp b/packages/kokkos/core/unit_test/TestStackTrace.hpp
index 8a5a5531e..bbdf8eef3 100644
--- a/packages/kokkos/core/unit_test/TestStackTrace.hpp
+++ b/packages/kokkos/core/unit_test/TestStackTrace.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestStackTrace_f0.cpp b/packages/kokkos/core/unit_test/TestStackTrace_f0.cpp
index 343f0227b..f29a6ca31 100644
--- a/packages/kokkos/core/unit_test/TestStackTrace_f0.cpp
+++ b/packages/kokkos/core/unit_test/TestStackTrace_f0.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestStackTrace_f1.cpp b/packages/kokkos/core/unit_test/TestStackTrace_f1.cpp
index 8a9c7f42a..7a3fdb3d5 100644
--- a/packages/kokkos/core/unit_test/TestStackTrace_f1.cpp
+++ b/packages/kokkos/core/unit_test/TestStackTrace_f1.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestStackTrace_f2.cpp b/packages/kokkos/core/unit_test/TestStackTrace_f2.cpp
index 306af89b6..5e7830459 100644
--- a/packages/kokkos/core/unit_test/TestStackTrace_f2.cpp
+++ b/packages/kokkos/core/unit_test/TestStackTrace_f2.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestStackTrace_f3.cpp b/packages/kokkos/core/unit_test/TestStackTrace_f3.cpp
index 90eb76832..899c75f98 100644
--- a/packages/kokkos/core/unit_test/TestStackTrace_f3.cpp
+++ b/packages/kokkos/core/unit_test/TestStackTrace_f3.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestStackTrace_f4.cpp b/packages/kokkos/core/unit_test/TestStackTrace_f4.cpp
index 9d5edcbfa..58118dc09 100644
--- a/packages/kokkos/core/unit_test/TestStackTrace_f4.cpp
+++ b/packages/kokkos/core/unit_test/TestStackTrace_f4.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestTaskScheduler.hpp b/packages/kokkos/core/unit_test/TestTaskScheduler.hpp
index aac742ba8..8eb1e3118 100644
--- a/packages/kokkos/core/unit_test/TestTaskScheduler.hpp
+++ b/packages/kokkos/core/unit_test/TestTaskScheduler.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestTaskScheduler_single.hpp b/packages/kokkos/core/unit_test/TestTaskScheduler_single.hpp
index dba3f4c31..e159995b8 100644
--- a/packages/kokkos/core/unit_test/TestTaskScheduler_single.hpp
+++ b/packages/kokkos/core/unit_test/TestTaskScheduler_single.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestTeam.hpp b/packages/kokkos/core/unit_test/TestTeam.hpp
index a299a51f7..09547281b 100644
--- a/packages/kokkos/core/unit_test/TestTeam.hpp
+++ b/packages/kokkos/core/unit_test/TestTeam.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestTeamTeamSize.hpp b/packages/kokkos/core/unit_test/TestTeamTeamSize.hpp
index c4f6ee576..1656d100e 100644
--- a/packages/kokkos/core/unit_test/TestTeamTeamSize.hpp
+++ b/packages/kokkos/core/unit_test/TestTeamTeamSize.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestTeamVector.hpp b/packages/kokkos/core/unit_test/TestTeamVector.hpp
index 463b563ae..0e9c26508 100644
--- a/packages/kokkos/core/unit_test/TestTeamVector.hpp
+++ b/packages/kokkos/core/unit_test/TestTeamVector.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestTeamVectorRange.hpp b/packages/kokkos/core/unit_test/TestTeamVectorRange.hpp
index 21cb34cbf..278c397d2 100644
--- a/packages/kokkos/core/unit_test/TestTeamVectorRange.hpp
+++ b/packages/kokkos/core/unit_test/TestTeamVectorRange.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestTemplateMetaFunctions.hpp b/packages/kokkos/core/unit_test/TestTemplateMetaFunctions.hpp
index 06c4297aa..a751f77b3 100644
--- a/packages/kokkos/core/unit_test/TestTemplateMetaFunctions.hpp
+++ b/packages/kokkos/core/unit_test/TestTemplateMetaFunctions.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestTile.hpp b/packages/kokkos/core/unit_test/TestTile.hpp
index befc22e87..1531ed630 100644
--- a/packages/kokkos/core/unit_test/TestTile.hpp
+++ b/packages/kokkos/core/unit_test/TestTile.hpp
@@ -1,10 +1,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestUniqueToken.hpp b/packages/kokkos/core/unit_test/TestUniqueToken.hpp
index 639a77343..140b1be23 100644
--- a/packages/kokkos/core/unit_test/TestUniqueToken.hpp
+++ b/packages/kokkos/core/unit_test/TestUniqueToken.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestUtilities.hpp b/packages/kokkos/core/unit_test/TestUtilities.hpp
index 2158a1f7d..16c4b5798 100644
--- a/packages/kokkos/core/unit_test/TestUtilities.hpp
+++ b/packages/kokkos/core/unit_test/TestUtilities.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestViewAPI.hpp b/packages/kokkos/core/unit_test/TestViewAPI.hpp
index 7b61e9f94..34c84ff84 100644
--- a/packages/kokkos/core/unit_test/TestViewAPI.hpp
+++ b/packages/kokkos/core/unit_test/TestViewAPI.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestViewAPI_a.hpp b/packages/kokkos/core/unit_test/TestViewAPI_a.hpp
index 1d176e588..166df9579 100644
--- a/packages/kokkos/core/unit_test/TestViewAPI_a.hpp
+++ b/packages/kokkos/core/unit_test/TestViewAPI_a.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestViewAPI_b.hpp b/packages/kokkos/core/unit_test/TestViewAPI_b.hpp
index 3188abc08..8aee22fe6 100644
--- a/packages/kokkos/core/unit_test/TestViewAPI_b.hpp
+++ b/packages/kokkos/core/unit_test/TestViewAPI_b.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestViewAPI_c.hpp b/packages/kokkos/core/unit_test/TestViewAPI_c.hpp
index be69e0951..60b2df0ba 100644
--- a/packages/kokkos/core/unit_test/TestViewAPI_c.hpp
+++ b/packages/kokkos/core/unit_test/TestViewAPI_c.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestViewAPI_d.hpp b/packages/kokkos/core/unit_test/TestViewAPI_d.hpp
index 93cc2e632..574a08140 100644
--- a/packages/kokkos/core/unit_test/TestViewAPI_d.hpp
+++ b/packages/kokkos/core/unit_test/TestViewAPI_d.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestViewAPI_e.hpp b/packages/kokkos/core/unit_test/TestViewAPI_e.hpp
index 864fcc48e..3f6b8c7fd 100644
--- a/packages/kokkos/core/unit_test/TestViewAPI_e.hpp
+++ b/packages/kokkos/core/unit_test/TestViewAPI_e.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestViewCopy.hpp b/packages/kokkos/core/unit_test/TestViewCopy.hpp
index f40d6f6ed..dc86589cb 100644
--- a/packages/kokkos/core/unit_test/TestViewCopy.hpp
+++ b/packages/kokkos/core/unit_test/TestViewCopy.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestViewCtorPropEmbeddedDim.hpp b/packages/kokkos/core/unit_test/TestViewCtorPropEmbeddedDim.hpp
index 199a426d9..5134f9349 100644
--- a/packages/kokkos/core/unit_test/TestViewCtorPropEmbeddedDim.hpp
+++ b/packages/kokkos/core/unit_test/TestViewCtorPropEmbeddedDim.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestViewLayoutStrideAssignment.hpp b/packages/kokkos/core/unit_test/TestViewLayoutStrideAssignment.hpp
index f3964c892..c0e6cea1f 100644
--- a/packages/kokkos/core/unit_test/TestViewLayoutStrideAssignment.hpp
+++ b/packages/kokkos/core/unit_test/TestViewLayoutStrideAssignment.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestViewLayoutTiled.hpp b/packages/kokkos/core/unit_test/TestViewLayoutTiled.hpp
index 502a6e519..036f418fb 100644
--- a/packages/kokkos/core/unit_test/TestViewLayoutTiled.hpp
+++ b/packages/kokkos/core/unit_test/TestViewLayoutTiled.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestViewMapping_a.hpp b/packages/kokkos/core/unit_test/TestViewMapping_a.hpp
index 1c79c2fc6..08d24ed77 100644
--- a/packages/kokkos/core/unit_test/TestViewMapping_a.hpp
+++ b/packages/kokkos/core/unit_test/TestViewMapping_a.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestViewMapping_b.hpp b/packages/kokkos/core/unit_test/TestViewMapping_b.hpp
index 3b7bddc17..9c3589b12 100644
--- a/packages/kokkos/core/unit_test/TestViewMapping_b.hpp
+++ b/packages/kokkos/core/unit_test/TestViewMapping_b.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestViewMapping_subview.hpp b/packages/kokkos/core/unit_test/TestViewMapping_subview.hpp
index 05836150a..33c51a0bd 100644
--- a/packages/kokkos/core/unit_test/TestViewMapping_subview.hpp
+++ b/packages/kokkos/core/unit_test/TestViewMapping_subview.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestViewOfClass.hpp b/packages/kokkos/core/unit_test/TestViewOfClass.hpp
index 678b06b86..5bd0ad86e 100644
--- a/packages/kokkos/core/unit_test/TestViewOfClass.hpp
+++ b/packages/kokkos/core/unit_test/TestViewOfClass.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestViewResize.hpp b/packages/kokkos/core/unit_test/TestViewResize.hpp
index abb9130da..b7453e049 100644
--- a/packages/kokkos/core/unit_test/TestViewResize.hpp
+++ b/packages/kokkos/core/unit_test/TestViewResize.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestViewSpaceAssign.hpp b/packages/kokkos/core/unit_test/TestViewSpaceAssign.hpp
index 0fa298732..f33210981 100644
--- a/packages/kokkos/core/unit_test/TestViewSpaceAssign.hpp
+++ b/packages/kokkos/core/unit_test/TestViewSpaceAssign.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestViewSubview.hpp b/packages/kokkos/core/unit_test/TestViewSubview.hpp
index dff70242f..2a92ce0e6 100644
--- a/packages/kokkos/core/unit_test/TestViewSubview.hpp
+++ b/packages/kokkos/core/unit_test/TestViewSubview.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestView_64bit.hpp b/packages/kokkos/core/unit_test/TestView_64bit.hpp
index 9a2905071..283f22350 100644
--- a/packages/kokkos/core/unit_test/TestView_64bit.hpp
+++ b/packages/kokkos/core/unit_test/TestView_64bit.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/TestWorkGraph.hpp b/packages/kokkos/core/unit_test/TestWorkGraph.hpp
index 11480461c..80d84a017 100644
--- a/packages/kokkos/core/unit_test/TestWorkGraph.hpp
+++ b/packages/kokkos/core/unit_test/TestWorkGraph.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/UnitTestMain.cpp b/packages/kokkos/core/unit_test/UnitTestMain.cpp
index 54644bd4d..b58f292c6 100644
--- a/packages/kokkos/core/unit_test/UnitTestMain.cpp
+++ b/packages/kokkos/core/unit_test/UnitTestMain.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/UnitTestMainInit.cpp b/packages/kokkos/core/unit_test/UnitTestMainInit.cpp
index 408b6fe3d..81d7a85e7 100644
--- a/packages/kokkos/core/unit_test/UnitTestMainInit.cpp
+++ b/packages/kokkos/core/unit_test/UnitTestMainInit.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/UnitTest_PushFinalizeHook.cpp b/packages/kokkos/core/unit_test/UnitTest_PushFinalizeHook.cpp
index dae33bd73..f9bd93a0e 100644
--- a/packages/kokkos/core/unit_test/UnitTest_PushFinalizeHook.cpp
+++ b/packages/kokkos/core/unit_test/UnitTest_PushFinalizeHook.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/UnitTest_PushFinalizeHook_terminate.cpp b/packages/kokkos/core/unit_test/UnitTest_PushFinalizeHook_terminate.cpp
index e030f9958..38ca47671 100644
--- a/packages/kokkos/core/unit_test/UnitTest_PushFinalizeHook_terminate.cpp
+++ b/packages/kokkos/core/unit_test/UnitTest_PushFinalizeHook_terminate.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_Category.hpp b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_Category.hpp
index 1680c6990..ef4044944 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_Category.hpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_SharedAlloc.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_SharedAlloc.cpp
index 4285d9daf..58382032a 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_SharedAlloc.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_SharedAlloc.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_a.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_a.cpp
index 3b27b544a..b366a136c 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_a.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_b.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_b.cpp
index 4b89d288c..0221a9b7f 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_b.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_c.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_c.cpp
index 3f82f8f77..046837669 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_c.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_d.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_d.cpp
index 2fd2cfac8..7da03135e 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_d.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_e.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_e.cpp
index 924b6b483..b6db12fcf 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_e.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewCopy.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewCopy.cpp
index 374859235..29649e8dc 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewCopy.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewCopy.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_a.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_a.cpp
index 43d285be4..4541e071b 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_a.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_b.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_b.cpp
index 405880237..d271da43d 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_b.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_subview.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_subview.cpp
index 0e1e6ebee..8fc44ac6b 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_subview.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_Category.hpp b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_Category.hpp
index f438698f2..55d9fc493 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_Category.hpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_SharedAlloc.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_SharedAlloc.cpp
index abee253ab..0530e694a 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_SharedAlloc.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_SharedAlloc.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_a.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_a.cpp
index cd535e605..c33125312 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_a.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_b.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_b.cpp
index b3da2b581..01d5dd2d2 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_b.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_c.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_c.cpp
index 2e53e7a81..58ed9b583 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_c.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_d.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_d.cpp
index f9dea646f..940a01c97 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_d.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_e.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_e.cpp
index 5a8399c48..7fabb26e4 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_e.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewCopy.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewCopy.cpp
index b0ea67a1b..035f025f0 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewCopy.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewCopy.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_a.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_a.cpp
index 302f320a2..719f9501b 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_a.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_b.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_b.cpp
index ff378b530..16d11c08a 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_b.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_subview.cpp b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_subview.cpp
index d4fdab743..290a038a2 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_subview.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexdouble.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexdouble.cpp
index 1448e61c0..0af8a9071 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexdouble.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexdouble.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexfloat.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexfloat.cpp
index 36e37228b..c15eb0443 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexfloat.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexfloat.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_double.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_double.cpp
index b1dfafd4b..dfb7f3d7d 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_double.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_double.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_float.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_float.cpp
index b3337ce88..adb9f4cb7 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_float.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_float.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_int.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_int.cpp
index 8217b2c59..209aa26d5 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_int.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_int.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longint.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longint.cpp
index cbaa88880..6ead084b4 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longint.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longlongint.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longlongint.cpp
index 42e97c715..d75100e24 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longlongint.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longlongint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedint.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedint.cpp
index bb89ef09b..9b321f9e2 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedint.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedlongint.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedlongint.cpp
index 52cdcfaa6..c5b2819f7 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedlongint.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedlongint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicViews.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicViews.cpp
index b37416a64..07d504ac8 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicViews.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_AtomicViews.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_Atomics.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_Atomics.cpp
index 763cacfd4..cab3a49d3 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_Atomics.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_Atomics.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_Category.hpp b/packages/kokkos/core/unit_test/cuda/TestCuda_Category.hpp
index a8faaefca..5c6c7d6b6 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_Category.hpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_Complex.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_Complex.cpp
index ba554ac45..5acefba17 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_Complex.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_Complex.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_Crs.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_Crs.cpp
index 98f5e3793..8827bc797 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_Crs.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_Crs.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_DebugPinUVMSpace.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_DebugPinUVMSpace.cpp
index 6dbb41290..cef18818f 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_DebugPinUVMSpace.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_DebugPinUVMSpace.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_DebugSerialExecution.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_DebugSerialExecution.cpp
index a0ffc530f..c0b4b2e42 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_DebugSerialExecution.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_DebugSerialExecution.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_DeepCopyAlignment.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_DeepCopyAlignment.cpp
index 620d29045..eba936f75 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_DeepCopyAlignment.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_DeepCopyAlignment.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_FunctorAnalysis.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_FunctorAnalysis.cpp
index 3090af741..0c06ebb19 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_FunctorAnalysis.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_FunctorAnalysis.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_Init.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_Init.cpp
index f248911cd..5375b23e8 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_Init.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_Init.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_InterOp_Init.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_InterOp_Init.cpp
index 60fc8fc1f..b7b1c9656 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_InterOp_Init.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_InterOp_Init.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_InterOp_Streams.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_InterOp_Streams.cpp
index 0eac62e9a..968a7440f 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_InterOp_Streams.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_InterOp_Streams.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_LocalDeepCopy.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_LocalDeepCopy.cpp
index 9f93c684c..d2525e9bf 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_LocalDeepCopy.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_LocalDeepCopy.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_a.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_a.cpp
index cd22b71fc..4292f8270 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_a.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_a.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_b.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_b.cpp
index 021eb2c74..fe5a391cd 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_b.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_b.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_c.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_c.cpp
index 18673da7a..069b39a98 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_c.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_c.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_d.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_d.cpp
index 88c64f66d..01b642c77 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_d.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_d.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_e.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_e.cpp
index d76ccd4e9..d6a712008 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_e.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_MDRange_e.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_Other.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_Other.cpp
index 70c09c610..48a07822a 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_Other.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_Other.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_RangePolicy.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_RangePolicy.cpp
index 34adce987..eeba7724a 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_RangePolicy.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_RangePolicy.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_Reducers_a.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_Reducers_a.cpp
index c26b8a63e..125434c19 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_Reducers_a.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_Reducers_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_Reducers_b.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_Reducers_b.cpp
index 17959930d..21448c22a 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_Reducers_b.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_Reducers_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_Reducers_c.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_Reducers_c.cpp
index add28b5b2..56bbc6736 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_Reducers_c.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_Reducers_c.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_Reducers_d.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_Reducers_d.cpp
index 5fb1c1f2e..b0493cf42 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_Reducers_d.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_Reducers_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_Reductions.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_Reductions.cpp
index fe719c422..d365103ce 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_Reductions.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_Reductions.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_Reductions_DeviceView.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_Reductions_DeviceView.cpp
index 5b3409014..cdc63da24 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_Reductions_DeviceView.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_Reductions_DeviceView.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_Scan.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_Scan.cpp
index b2ed2ed0c..226ecd3c4 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_Scan.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_Scan.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_SharedAlloc.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_SharedAlloc.cpp
index e3a62c8d8..4f50a1e92 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_SharedAlloc.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_SharedAlloc.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_Spaces.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_Spaces.cpp
index 2f96de945..9ae32a7b0 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_Spaces.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_Spaces.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_a.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_a.cpp
index e24de1163..c4c998aa2 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_a.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_b.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_b.cpp
index b0e82776a..549af99ad 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_b.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c01.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c01.cpp
index a68e1bd86..d087b2563 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c01.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c01.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c02.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c02.cpp
index 88c5ebffc..36b401524 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c02.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c02.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c03.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c03.cpp
index 2470d46a1..5fce4b6af 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c03.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c03.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c04.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c04.cpp
index 7f26241fa..ea1ec7adc 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c04.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c04.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c05.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c05.cpp
index 3cc5cbb18..4e4556291 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c05.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c05.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c06.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c06.cpp
index 4db8f74f8..c7844f96a 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c06.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c06.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c07.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c07.cpp
index 3cc222698..2674ecab9 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c07.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c07.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c08.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c08.cpp
index 5b571057b..c3ed99580 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c08.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c08.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c09.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c09.cpp
index 98c67cf02..e76c65391 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c09.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c09.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c10.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c10.cpp
index d1063ad89..fb9399850 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c10.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c10.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c11.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c11.cpp
index e409204b9..99c75339a 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c11.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c11.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c12.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c12.cpp
index e24af0b9b..da7aa69cd 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c12.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c12.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c13.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c13.cpp
index 3a5754ba9..7da8f35a7 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c13.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_SubView_c13.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_Task.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_Task.cpp
index 72c1de65f..ca30ad940 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_Task.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_Task.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_Team.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_Team.cpp
index 95bd6c66d..456d92e94 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_Team.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_Team.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_TeamReductionScan.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_TeamReductionScan.cpp
index 414e38594..8fa2d40bb 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_TeamReductionScan.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_TeamReductionScan.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_TeamScratch.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_TeamScratch.cpp
index c84cb0b6e..d7eda3bb6 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_TeamScratch.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_TeamScratch.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_TeamTeamSize.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_TeamTeamSize.cpp
index 7e61e0810..832dc7b13 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_TeamTeamSize.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_TeamTeamSize.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_TeamVectorRange.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_TeamVectorRange.cpp
index 7031139d5..da8311256 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_TeamVectorRange.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_TeamVectorRange.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_UniqueToken.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_UniqueToken.cpp
index 0ccd2ee14..07188f7ed 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_UniqueToken.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_UniqueToken.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_a.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_a.cpp
index 2fb4e9e78..cf02295bc 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_a.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_b.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_b.cpp
index 080002dab..9056ac82f 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_b.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_c.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_c.cpp
index 536b24fb3..6d56d499e 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_c.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_d.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_d.cpp
index 5bcf5407d..55b2191a3 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_d.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_e.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_e.cpp
index b2e00dba4..501a25e07 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_e.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewLayoutStrideAssignment.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewLayoutStrideAssignment.cpp
index cf5aaee0d..84ad1ca34 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewLayoutStrideAssignment.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewLayoutStrideAssignment.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_a.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_a.cpp
index 181d8f4be..c02b3adef 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_a.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_b.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_b.cpp
index 29777967c..809469484 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_b.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_subview.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_subview.cpp
index 2a50ee735..9b4b56b33 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_subview.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewOfClass.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewOfClass.cpp
index 771df9fca..3c935daa7 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewOfClass.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewOfClass.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewResize.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewResize.cpp
index d4a7bb428..fec5a5470 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_ViewResize.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_ViewResize.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_View_64bit.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_View_64bit.cpp
index 1f5d6f697..e6723df8a 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_View_64bit.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_View_64bit.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/cuda/TestCuda_WorkGraph.cpp b/packages/kokkos/core/unit_test/cuda/TestCuda_WorkGraph.cpp
index d3a4736fd..042763200 100644
--- a/packages/kokkos/core/unit_test/cuda/TestCuda_WorkGraph.cpp
+++ b/packages/kokkos/core/unit_test/cuda/TestCuda_WorkGraph.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType.cpp b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType.cpp
index f56fab268..001b8dfc3 100644
--- a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType.cpp
+++ b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/default/TestDefaultDeviceTypeResize.cpp b/packages/kokkos/core/unit_test/default/TestDefaultDeviceTypeResize.cpp
index e9261c63b..1d4154d0a 100644
--- a/packages/kokkos/core/unit_test/default/TestDefaultDeviceTypeResize.cpp
+++ b/packages/kokkos/core/unit_test/default/TestDefaultDeviceTypeResize.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_Category.hpp b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_Category.hpp
index a3cf76b40..7c5b54eac 100644
--- a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_Category.hpp
+++ b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_a1.cpp b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_a1.cpp
index 24f4788e5..e220cacad 100644
--- a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_a1.cpp
+++ b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_a1.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_a2.cpp b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_a2.cpp
index ddfa8420a..ffc541cff 100644
--- a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_a2.cpp
+++ b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_a2.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_a3.cpp b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_a3.cpp
index 92571b4b6..c7335a55d 100644
--- a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_a3.cpp
+++ b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_a3.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_b1.cpp b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_b1.cpp
index ee4227d71..212c708ab 100644
--- a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_b1.cpp
+++ b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_b1.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_b2.cpp b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_b2.cpp
index 685310836..5cbba21b5 100644
--- a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_b2.cpp
+++ b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_b2.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_b3.cpp b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_b3.cpp
index be1d6eab2..94db29ad8 100644
--- a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_b3.cpp
+++ b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_b3.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_c1.cpp b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_c1.cpp
index 52661d002..b718a4b7f 100644
--- a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_c1.cpp
+++ b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_c1.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_c2.cpp b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_c2.cpp
index 79a0a45b6..64c1e06a9 100644
--- a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_c2.cpp
+++ b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_c2.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_c3.cpp b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_c3.cpp
index fdd100077..742e253b1 100644
--- a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_c3.cpp
+++ b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_c3.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_d.cpp b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_d.cpp
index 477c48354..bed98a82e 100644
--- a/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_d.cpp
+++ b/packages/kokkos/core/unit_test/default/TestDefaultDeviceType_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexdouble.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexdouble.cpp
index 4505945de..8dc9e2cd0 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexdouble.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexdouble.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexfloat.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexfloat.cpp
index 6a0f7b6bf..efac2eaf8 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexfloat.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexfloat.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_double.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_double.cpp
index 74558f458..d13554c37 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_double.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_double.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_float.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_float.cpp
index 2b4ff99a7..db595dac7 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_float.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_float.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_int.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_int.cpp
index d0cd087f7..49e1cd99a 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_int.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_int.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longint.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longint.cpp
index 044d826e3..5c22605c3 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longint.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longlongint.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longlongint.cpp
index 2ccb31848..dbef878c4 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longlongint.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longlongint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedint.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedint.cpp
index 27095d129..649bdca23 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedint.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedlongint.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedlongint.cpp
index 187e0ee00..b1e813c31 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedlongint.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedlongint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicViews.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicViews.cpp
index d45cbcd0e..b70f24c2d 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicViews.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_AtomicViews.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_Atomics.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_Atomics.cpp
index cbbe68cc6..049679d4c 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_Atomics.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_Atomics.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_Category.hpp b/packages/kokkos/core/unit_test/hpx/TestHPX_Category.hpp
index a6a668d6b..6e543c7f5 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_Category.hpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_Complex.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_Complex.cpp
index 00b73b57c..e4b6ee61d 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_Complex.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_Complex.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_Crs.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_Crs.cpp
index 33f4262b8..7704a8c09 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_Crs.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_Crs.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_DeepCopyAlignment.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_DeepCopyAlignment.cpp
index e4d4c25d0..0191adfc9 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_DeepCopyAlignment.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_DeepCopyAlignment.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_FunctorAnalysis.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_FunctorAnalysis.cpp
index 6f03f02e3..d311154fa 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_FunctorAnalysis.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_FunctorAnalysis.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_Init.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_Init.cpp
index 4e6ee6615..76f7e0100 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_Init.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_Init.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_InterOp.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_InterOp.cpp
index 04092c4b2..c0d490fff 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_InterOp.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_InterOp.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_LocalDeepCopy.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_LocalDeepCopy.cpp
index 135205c84..8f46f2953 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_LocalDeepCopy.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_LocalDeepCopy.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_a.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_a.cpp
index 2daeed1f9..6d72e5a7f 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_a.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_a.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_b.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_b.cpp
index 08c80afca..bac18449d 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_b.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_b.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_c.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_c.cpp
index 818f138ed..23a0648ce 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_c.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_c.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_d.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_d.cpp
index 81463a2ef..0d46bb244 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_d.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_d.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_e.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_e.cpp
index 1480a15e5..2f2444924 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_e.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_MDRange_e.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_Other.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_Other.cpp
index 3f74ceb7e..18d53c9ca 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_Other.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_Other.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_RangePolicy.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_RangePolicy.cpp
index 813a24352..01f4df2a2 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_RangePolicy.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_RangePolicy.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_Reducers_a.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_Reducers_a.cpp
index 5fbe0ff99..b35abc9ee 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_Reducers_a.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_Reducers_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_Reducers_b.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_Reducers_b.cpp
index d4ed60f1a..a879b09dc 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_Reducers_b.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_Reducers_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_Reducers_c.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_Reducers_c.cpp
index 87704c440..ffb4febc8 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_Reducers_c.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_Reducers_c.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_Reducers_d.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_Reducers_d.cpp
index 86895358f..d35ca42c8 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_Reducers_d.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_Reducers_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_Reductions.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_Reductions.cpp
index d8cf6f3da..80233af88 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_Reductions.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_Reductions.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_Reductions_DeviceView.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_Reductions_DeviceView.cpp
index 2db02a953..cdd70d6af 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_Reductions_DeviceView.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_Reductions_DeviceView.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_Scan.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_Scan.cpp
index 8495e91fd..e7b482bbd 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_Scan.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_Scan.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_SharedAlloc.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_SharedAlloc.cpp
index 67109d6ea..fe00fd6e2 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_SharedAlloc.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_SharedAlloc.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_a.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_a.cpp
index f8b226787..dec02a186 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_a.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_b.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_b.cpp
index 1a0f81d76..92698655a 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_b.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c01.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c01.cpp
index 6e6b59396..420fbb183 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c01.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c01.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c02.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c02.cpp
index 369fb305e..b64761355 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c02.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c02.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c03.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c03.cpp
index 3baffd89f..36fdf3cfd 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c03.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c03.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c04.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c04.cpp
index 757417c9f..6e8e46c0d 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c04.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c04.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c05.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c05.cpp
index 03abd8c93..c4cc4a759 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c05.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c05.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c06.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c06.cpp
index dd5056d99..bb1a6b6c9 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c06.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c06.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c07.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c07.cpp
index ea4556f57..06471dcfd 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c07.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c07.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c08.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c08.cpp
index b7a560982..09bb81009 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c08.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c08.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c09.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c09.cpp
index bd3448ebf..75c8fee26 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c09.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c09.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c10.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c10.cpp
index 474ced795..5a9a1d6ac 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c10.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c10.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c11.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c11.cpp
index 62f0c0b6d..05971955f 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c11.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c11.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c12.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c12.cpp
index 5d9bb8802..dd9733013 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c12.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c12.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c13.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c13.cpp
index 8b4a37037..b06438492 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c13.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_SubView_c13.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_Task.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_Task.cpp
index 82e7dda99..59b8fa411 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_Task.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_Task.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_Team.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_Team.cpp
index 7249c6555..3c76fd933 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_Team.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_Team.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_TeamReductionScan.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_TeamReductionScan.cpp
index b858f1070..e025517fb 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_TeamReductionScan.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_TeamReductionScan.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_TeamScratch.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_TeamScratch.cpp
index 9bb95a0e4..86a858510 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_TeamScratch.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_TeamScratch.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_TeamTeamSize.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_TeamTeamSize.cpp
index 22896713c..6ee688daa 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_TeamTeamSize.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_TeamTeamSize.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_TeamVectorRange.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_TeamVectorRange.cpp
index d5574514c..a276cf19d 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_TeamVectorRange.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_TeamVectorRange.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_UniqueToken.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_UniqueToken.cpp
index e2ff1970c..108dc5359 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_UniqueToken.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_UniqueToken.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_a.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_a.cpp
index 198aaba0f..1d4bdb8ac 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_a.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_b.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_b.cpp
index bafc73566..442fc43db 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_b.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_c.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_c.cpp
index 039755864..91f529422 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_c.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_d.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_d.cpp
index aec887189..dc2b77974 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_d.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_e.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_e.cpp
index 3cc3f0cdd..88847fe35 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_e.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewLayoutStrideAssignment.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewLayoutStrideAssignment.cpp
index 8bb932552..b937f4b45 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewLayoutStrideAssignment.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewLayoutStrideAssignment.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_a.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_a.cpp
index 8629916bc..8751484fc 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_a.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_b.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_b.cpp
index fa55237a7..c1e728e34 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_b.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_subview.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_subview.cpp
index d1a2e6cdd..be935c03c 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_subview.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewOfClass.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewOfClass.cpp
index 384305a39..42952e95e 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewOfClass.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewOfClass.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewResize.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewResize.cpp
index 0b5afd4a4..0564c2a60 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_ViewResize.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_ViewResize.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_View_64bit.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_View_64bit.cpp
index 18d08ceda..0a70dcf27 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_View_64bit.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_View_64bit.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/hpx/TestHPX_WorkGraph.cpp b/packages/kokkos/core/unit_test/hpx/TestHPX_WorkGraph.cpp
index 0841fa9ec..79c3fb3bb 100644
--- a/packages/kokkos/core/unit_test/hpx/TestHPX_WorkGraph.cpp
+++ b/packages/kokkos/core/unit_test/hpx/TestHPX_WorkGraph.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP.hpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP.hpp
index 9e0687688..4b7d76972 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP.hpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexdouble.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexdouble.cpp
index d88162f87..e0d0cdd2f 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexdouble.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexdouble.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexfloat.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexfloat.cpp
index c87469ad8..9b1cb39ec 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexfloat.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexfloat.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_double.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_double.cpp
index 16bf20b64..74237f266 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_double.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_double.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_float.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_float.cpp
index 0c490083c..39f2b1f74 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_float.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_float.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_int.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_int.cpp
index 3d7f2e41a..e395d6ff7 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_int.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_int.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longint.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longint.cpp
index 34f73cc46..71a6a3d61 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longint.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longlongint.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longlongint.cpp
index 4ddf078f1..ab663b5e0 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longlongint.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longlongint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedint.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedint.cpp
index 7ada97d58..a40425da5 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedint.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedlongint.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedlongint.cpp
index 83ff91d20..d3b5fabe7 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedlongint.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedlongint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicViews.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicViews.cpp
index 332accce8..0749b6850 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicViews.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_AtomicViews.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Atomics.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Atomics.cpp
index 3a51fc012..e6bf6c89d 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Atomics.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Atomics.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Category.hpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Category.hpp
index fdc15cbf9..c1ea4097d 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Category.hpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Complex.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Complex.cpp
index 3cc0e0d8c..9d01d3e71 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Complex.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Complex.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Crs.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Crs.cpp
index 1f97bb95d..e8d13925a 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Crs.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Crs.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_DeepCopyAlignment.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_DeepCopyAlignment.cpp
index bd628e695..4785296f8 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_DeepCopyAlignment.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_DeepCopyAlignment.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_FunctorAnalysis.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_FunctorAnalysis.cpp
index 6bf203364..a1917a56e 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_FunctorAnalysis.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_FunctorAnalysis.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Init.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Init.cpp
index a4dcbe99d..fed5f7258 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Init.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Init.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_InterOp.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_InterOp.cpp
index 2feca49f8..bb2fb7640 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_InterOp.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_InterOp.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_LocalDeepCopy.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_LocalDeepCopy.cpp
index 4626c6a0f..e1e244292 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_LocalDeepCopy.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_LocalDeepCopy.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_a.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_a.cpp
index e5a7711f1..ded9c0ee8 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_a.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_a.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_b.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_b.cpp
index 7269d7252..10ebea107 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_b.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_b.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_c.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_c.cpp
index 71187b2da..ca3598d8b 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_c.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_c.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_d.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_d.cpp
index bae5f1655..4630c83f1 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_d.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_d.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_e.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_e.cpp
index 3576daa92..0df3ed92d 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_e.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_e.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Other.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Other.cpp
index 7fd9b9c5d..25612ad16 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Other.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Other.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_RangePolicy.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_RangePolicy.cpp
index 5a443a73c..386f12acc 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_RangePolicy.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_RangePolicy.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_a.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_a.cpp
index 61537ac93..21d7dd117 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_a.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_b.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_b.cpp
index 686e5a02d..9fc9082ad 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_b.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_c.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_c.cpp
index 1bed6ce9a..121f0020f 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_c.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_c.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_d.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_d.cpp
index 12c7cdd8f..93c16d64e 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_d.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reductions.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reductions.cpp
index c4554f2c4..52b99830c 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reductions.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reductions.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reductions_DeviceView.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reductions_DeviceView.cpp
index 99fe5842c..b40699879 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reductions_DeviceView.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Reductions_DeviceView.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Scan.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Scan.cpp
index 24922a907..3ae5d2023 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Scan.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Scan.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SharedAlloc.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SharedAlloc.cpp
index 81eb4daa1..4e97a3ab1 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SharedAlloc.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SharedAlloc.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_a.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_a.cpp
index 463a3dae5..cbecfd08d 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_a.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_b.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_b.cpp
index ca29c0ee6..e5d1575a1 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_b.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c01.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c01.cpp
index ad7020ea3..3a2e7c74b 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c01.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c01.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c02.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c02.cpp
index b20ed5b61..370b44c89 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c02.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c02.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c03.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c03.cpp
index 74425a389..f0b7f4d35 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c03.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c03.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c04.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c04.cpp
index d6d27f0e8..99472f00f 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c04.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c04.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c05.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c05.cpp
index 86d95434e..db398a64f 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c05.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c05.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c06.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c06.cpp
index a746a2fb8..6e509af3a 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c06.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c06.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c07.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c07.cpp
index 9b22ecbc5..8087d1be5 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c07.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c07.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c08.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c08.cpp
index 6426c35d1..7bef1126b 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c08.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c08.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c09.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c09.cpp
index 234d16593..166ec4ab8 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c09.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c09.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c10.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c10.cpp
index 4049469d7..a25c1b1a1 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c10.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c10.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c11.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c11.cpp
index 321f25bbd..cf9e108f4 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c11.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c11.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c12.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c12.cpp
index aae96704c..29801a54d 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c12.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c12.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c13.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c13.cpp
index 72a1a31e8..7cf7c0c28 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c13.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c13.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Task.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Task.cpp
index 81b10d647..8958999bc 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Task.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Task.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Team.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Team.cpp
index e2ac253d6..12fc2d544 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_Team.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_Team.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_TeamReductionScan.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_TeamReductionScan.cpp
index 2b636508d..5b1a7da3f 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_TeamReductionScan.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_TeamReductionScan.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_TeamScratch.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_TeamScratch.cpp
index 947335e84..52dc9fdd5 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_TeamScratch.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_TeamScratch.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_TeamTeamSize.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_TeamTeamSize.cpp
index 7e8db5034..72bbdc669 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_TeamTeamSize.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_TeamTeamSize.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_TeamVectorRange.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_TeamVectorRange.cpp
index 9670dff45..d11a19239 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_TeamVectorRange.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_TeamVectorRange.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_UniqueToken.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_UniqueToken.cpp
index f0ae70174..8e996d710 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_UniqueToken.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_UniqueToken.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_a.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_a.cpp
index a7a441c8e..8aa53d5e5 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_a.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_b.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_b.cpp
index 97aaee46e..bbc7de78f 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_b.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_c.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_c.cpp
index 6fcbdd319..13dd73dce 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_c.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_d.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_d.cpp
index dbfcd9ff2..05aedc329 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_d.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_e.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_e.cpp
index 2e8134aac..e5efc3cbd 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_e.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewLayoutStrideAssignment.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewLayoutStrideAssignment.cpp
index 5a277c2e9..7544e879d 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewLayoutStrideAssignment.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewLayoutStrideAssignment.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_a.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_a.cpp
index 5655b8b34..ceb1bd993 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_a.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_b.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_b.cpp
index b001a080f..5558adeb9 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_b.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_subview.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_subview.cpp
index 7ad4568d5..46cd0e278 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_subview.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewOfClass.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewOfClass.cpp
index 53c2c3b20..a099d6a46 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewOfClass.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewOfClass.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewResize.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewResize.cpp
index 44c2ad42e..f8bf1d7dc 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewResize.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_ViewResize.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_View_64bit.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_View_64bit.cpp
index a1afbaba7..153cf6b34 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_View_64bit.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_View_64bit.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmp/TestOpenMP_WorkGraph.cpp b/packages/kokkos/core/unit_test/openmp/TestOpenMP_WorkGraph.cpp
index ad2bd00b8..4a1300040 100644
--- a/packages/kokkos/core/unit_test/openmp/TestOpenMP_WorkGraph.cpp
+++ b/packages/kokkos/core/unit_test/openmp/TestOpenMP_WorkGraph.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget.hpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget.hpp
index 8f5f8706e..4daa3893e 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget.hpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexdouble.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexdouble.cpp
index aa11a39d4..55e834ec0 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexdouble.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexdouble.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexfloat.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexfloat.cpp
index 3da492661..617cef61e 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexfloat.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexfloat.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_double.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_double.cpp
index a278b89bc..735bbfd16 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_double.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_double.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_float.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_float.cpp
index 184663384..b4dad835a 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_float.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_float.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_int.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_int.cpp
index 69743797c..b27b8e6ea 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_int.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_int.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longint.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longint.cpp
index e626cc350..f55fd3bf0 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longint.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longlongint.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longlongint.cpp
index cc216e8b0..cce081585 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longlongint.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longlongint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedint.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedint.cpp
index de31b6711..8bb7577e7 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedint.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedlongint.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedlongint.cpp
index 0d0b080a1..46bcafefa 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedlongint.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedlongint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicViews.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicViews.cpp
index 7c573cfa2..47cb4cfe3 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicViews.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicViews.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Atomics.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Atomics.cpp
index f7be31800..151b83316 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Atomics.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Atomics.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Category.hpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Category.hpp
index ee44bbe4f..625fa59f4 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Category.hpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Complex.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Complex.cpp
index 92692f9aa..9f4690cb4 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Complex.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Complex.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_DeepCopyAlignment.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_DeepCopyAlignment.cpp
index 62af98a73..e0ff55d4a 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_DeepCopyAlignment.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_DeepCopyAlignment.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Init.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Init.cpp
index d40732a21..5863f6106 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Init.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Init.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_a.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_a.cpp
index f5e7186dd..4c7513c2d 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_a.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_a.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_b.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_b.cpp
index d6cac02e8..06977c603 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_b.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_b.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_c.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_c.cpp
index 3ab0fc793..94230d627 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_c.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_c.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_d.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_d.cpp
index 1abdfaba8..7b5ade89d 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_d.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_d.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_e.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_e.cpp
index f530969a3..9570a5f65 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_e.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_e.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Other.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Other.cpp
index 8a87a1701..e89a0f1ec 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Other.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Other.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_RangePolicy.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_RangePolicy.cpp
index 68188f209..ddff79bcf 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_RangePolicy.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_RangePolicy.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_a.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_a.cpp
index bee82e631..2605d621f 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_a.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_b.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_b.cpp
index 1ac4db840..b78fb3eb6 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_b.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_c.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_c.cpp
index f2c0f0d1d..281074904 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_c.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_c.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_d.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_d.cpp
index 079c05320..9bdae00a1 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_d.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reductions.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reductions.cpp
index 1052fea30..5405aebbb 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reductions.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reductions.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Scan.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Scan.cpp
index 35bc81002..5bf1773f2 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Scan.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Scan.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SharedAlloc.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SharedAlloc.cpp
index d5ed4c918..1e11094d2 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SharedAlloc.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SharedAlloc.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_a.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_a.cpp
index 2140a2f2f..c9fd773e3 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_a.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_b.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_b.cpp
index 4803d5afc..0e4503bb1 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_b.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c01.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c01.cpp
index 941c20884..143adb3ea 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c01.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c01.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c02.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c02.cpp
index 113f47975..97b27b155 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c02.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c02.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c03.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c03.cpp
index ab2ff01e6..250d46bb4 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c03.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c03.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c04.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c04.cpp
index a416ab560..1da9b7b4a 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c04.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c04.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c05.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c05.cpp
index 40af71bfd..c02c38cfc 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c05.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c05.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c06.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c06.cpp
index 97e7706fc..42eb75213 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c06.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c06.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c07.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c07.cpp
index 56f639a59..bec4fd6ab 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c07.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c07.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c08.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c08.cpp
index 656115117..6b10d7b58 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c08.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c08.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c09.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c09.cpp
index c00112492..4271303e3 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c09.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c09.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c10.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c10.cpp
index 5956f4709..9a8dddbcd 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c10.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c10.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c11.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c11.cpp
index d13b24bb9..44522f4cd 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c11.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c11.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c12.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c12.cpp
index 097b33e9d..279fdac42 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c12.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c12.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Team.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Team.cpp
index 7b827e26d..c86748b83 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Team.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Team.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamReductionScan.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamReductionScan.cpp
index 962cc87b2..03ff05ba7 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamReductionScan.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamReductionScan.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamScratch.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamScratch.cpp
index 2593609e3..ca10cda30 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamScratch.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamScratch.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_a.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_a.cpp
index afa9631a8..5a6257bee 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_a.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_b.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_b.cpp
index bb5272d2c..baaaccd86 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_b.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_c.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_c.cpp
index bc34437c0..64cd5ae8f 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_c.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_d.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_d.cpp
index 48478f52a..97152f6a0 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_d.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_e.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_e.cpp
index 27f9702ff..330bb5d95 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_e.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_a.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_a.cpp
index 61b281c9f..a9ccef970 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_a.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_b.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_b.cpp
index 355b29d03..03dd02193 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_b.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_subview.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_subview.cpp
index 2bf2ed578..58336f023 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_subview.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewOfClass.cpp b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewOfClass.cpp
index 6149f9105..51a7df0e3 100644
--- a/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewOfClass.cpp
+++ b/packages/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewOfClass.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexdouble.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexdouble.cpp
index abc0844be..fe46c7747 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexdouble.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexdouble.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexfloat.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexfloat.cpp
index 3d691574a..7962924b3 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexfloat.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexfloat.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_double.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_double.cpp
index e5ce718b0..b5c7fe829 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_double.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_double.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_float.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_float.cpp
index 90287fc0e..ecd563166 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_float.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_float.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_int.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_int.cpp
index 87dca37a2..905388c76 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_int.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_int.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longint.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longint.cpp
index 22f491e33..4cb34f729 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longint.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longlongint.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longlongint.cpp
index 97ecc5c6f..7dc313a59 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longlongint.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longlongint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedint.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedint.cpp
index 50927db4d..95c8950a0 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedint.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedlongint.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedlongint.cpp
index 96f878e24..cb8ce6980 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedlongint.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedlongint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_a.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_a.cpp
index 54d7891ca..241352322 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_a.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_a.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_b.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_b.cpp
index ebecc4a8c..de88404c9 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_b.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_b.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_c.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_c.cpp
index cbedd86d5..e68787743 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_c.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_c.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_d.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_d.cpp
index 13a635fdf..50f90aa3a 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_d.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_d.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_e.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_e.cpp
index 63ece32f4..5b691dc35 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_e.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_e.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_a.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_a.cpp
index 1b99fda81..22f8161eb 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_a.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_b.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_b.cpp
index 2f8ab0e1c..66ecdbf12 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_b.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_c.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_c.cpp
index dd5f532c1..51e17bf5c 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_c.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_d.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_d.cpp
index 11076b82b..30b605a64 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_d.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_e.cpp b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_e.cpp
index a81e0b006..1f83502ab 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_e.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads.hpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads.hpp
index afd98a100..ae5febb36 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads.hpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_Atomics.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_Atomics.cpp
index e37808b62..55da03ede 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_Atomics.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_Atomics.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_Category.hpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_Category.hpp
index 926a4290a..a68f8ae8a 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_Category.hpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_DeepCopyAlignment.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_DeepCopyAlignment.cpp
index 22d9dbb2f..ada18af0c 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_DeepCopyAlignment.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_DeepCopyAlignment.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_Other.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_Other.cpp
index 873f4f920..0a22415b7 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_Other.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_Other.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_Reductions.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_Reductions.cpp
index bdb8bc8de..be3675447 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_Reductions.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_Reductions.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_a.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_a.cpp
index 6f0c58af9..41b1b1c90 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_a.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_b.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_b.cpp
index 123095038..180934701 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_b.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c01.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c01.cpp
index d58f210a3..3d419f7a6 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c01.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c01.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c02.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c02.cpp
index 42bc9e194..f87c3ab5e 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c02.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c02.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c03.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c03.cpp
index 4a2ab687b..df309453c 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c03.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c03.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c04.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c04.cpp
index a99093a44..5d6a84a65 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c04.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c04.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c05.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c05.cpp
index 34d7cce71..3cf600f14 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c05.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c05.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c06.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c06.cpp
index 4943f9c0e..9812f7a56 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c06.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c06.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c07.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c07.cpp
index 3090726cf..243edc109 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c07.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c07.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c08.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c08.cpp
index 99bf58fdb..b56d895a4 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c08.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c08.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c09.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c09.cpp
index 9a8aa0517..2983a705f 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c09.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c09.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c10.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c10.cpp
index 597ee1bf7..78642bce8 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c10.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c10.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c11.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c11.cpp
index dc372ffb3..37715a148 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c11.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c11.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c12.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c12.cpp
index 56ed91a61..16eca1c29 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c12.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c12.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c13.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c13.cpp
index 6379bf2cb..5f3cd9180 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c13.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c13.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_Team.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_Team.cpp
index e882310c4..162b0625b 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_Team.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_Team.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_a.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_a.cpp
index c4a75b916..5c0bca1cc 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_a.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_b.cpp b/packages/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_b.cpp
index 20f1c79a1..838173877 100644
--- a/packages/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_b.cpp
+++ b/packages/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_Category.hpp b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_Category.hpp
index 65facc706..f39b07725 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_Category.hpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_SharedAlloc.cpp b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_SharedAlloc.cpp
index 7e70ab88c..cbe1f80b3 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_SharedAlloc.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_SharedAlloc.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_a.cpp b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_a.cpp
index 611f99c2d..865fb2fa3 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_a.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_b.cpp b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_b.cpp
index 4a391406b..47e55be07 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_b.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_c.cpp b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_c.cpp
index e121ba68e..263019256 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_c.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_d.cpp b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_d.cpp
index 00eb98dc4..8c6fd634b 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_d.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_e.cpp b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_e.cpp
index c62ec627d..72ff85065 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_e.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewCopy.cpp b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewCopy.cpp
index 4636691d9..fd3d1b4a1 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewCopy.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewCopy.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_a.cpp b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_a.cpp
index e2cfd4e4d..c3dc802cb 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_a.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_b.cpp b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_b.cpp
index 4ae295d32..05c2a3d4c 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_b.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_subview.cpp b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_subview.cpp
index d713c55f2..3649a1df3 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_subview.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_View_64bit.cpp b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_View_64bit.cpp
index d304f53cf..ab95ca5bb 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_View_64bit.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCmHostPinned_View_64bit.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_double.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_double.cpp
index c941c4d45..32abd5ce1 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_double.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_double.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_float.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_float.cpp
index 5f01897f6..5ac18ae78 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_float.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_float.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_int.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_int.cpp
index e64199dc6..6aa06234e 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_int.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_int.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longint.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longint.cpp
index ae7dcfa7b..ead0ab132 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longint.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longlongint.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longlongint.cpp
index cccb822a5..2ca88273b 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longlongint.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longlongint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedint.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedint.cpp
index 098d4e882..f551bf16d 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedint.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedlongint.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedlongint.cpp
index 1c865bbec..21ca5489f 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedlongint.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedlongint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicViews.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicViews.cpp
index 8e7d05c86..cceb16faf 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicViews.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_AtomicViews.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_Atomics.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_Atomics.cpp
index 54910d30a..b7c4078cf 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_Atomics.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_Atomics.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_Category.hpp b/packages/kokkos/core/unit_test/rocm/TestROCm_Category.hpp
index fd802942f..28d66c608 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_Category.hpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_Complex.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_Complex.cpp
index 6e233ef01..b42d18a26 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_Complex.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_Complex.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_Crs.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_Crs.cpp
index f60596fe3..5b7b3b2fe 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_Crs.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_Crs.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_DeepCopyAlignment.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_DeepCopyAlignment.cpp
index 85fd89fb2..f36f4ee9a 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_DeepCopyAlignment.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_DeepCopyAlignment.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_Init.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_Init.cpp
index af731816b..3c3b72e6f 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_Init.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_Init.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_a.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_a.cpp
index b1ff96efc..93fd63af6 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_a.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_a.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_b.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_b.cpp
index a307fb7e6..27b16a1cc 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_b.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_b.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_c.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_c.cpp
index 25630f0aa..e8b9aee2b 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_c.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_c.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_d.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_d.cpp
index f5488fba0..c54317038 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_d.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_d.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_e.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_e.cpp
index f820a5f74..c4928c1ff 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_e.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_e.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_a.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_a.cpp
index 1cd5f7b7c..ca1bd67cd 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_a.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_a.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_b.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_b.cpp
index 4216c1ab2..527b751b2 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_b.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_b.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_c.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_c.cpp
index d705a2b02..9214b94ea 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_c.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_c.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_d.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_d.cpp
index d60d9070a..69d6c2d4f 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_d.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_d.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_e.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_e.cpp
index fda8d8759..fa4b32495 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_e.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_MDRange_e.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_Other.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_Other.cpp
index a5ba15c75..2f603b194 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_Other.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_Other.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_RangePolicy.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_RangePolicy.cpp
index 92605deb8..6bbc747f5 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_RangePolicy.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_RangePolicy.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_Reducers_a.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_Reducers_a.cpp
index 14a199a71..0d91199a3 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_Reducers_a.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_Reducers_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_Reducers_b.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_Reducers_b.cpp
index 9f809eabb..c2f3c5888 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_Reducers_b.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_Reducers_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_Reducers_c.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_Reducers_c.cpp
index f0cdb520f..60996cf3a 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_Reducers_c.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_Reducers_c.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_Reducers_d.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_Reducers_d.cpp
index b8ad8897c..35eda65a0 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_Reducers_d.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_Reducers_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_Reductions.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_Reductions.cpp
index 70d6ee738..e79e91ef3 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_Reductions.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_Reductions.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_Scan.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_Scan.cpp
index 7a0db17e8..701fc1094 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_Scan.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_Scan.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_SharedAlloc.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_SharedAlloc.cpp
index 3862ffe04..fb2937289 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_SharedAlloc.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_SharedAlloc.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_Spaces.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_Spaces.cpp
index fe7346aaa..0e6abb95a 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_Spaces.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_Spaces.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_a.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_a.cpp
index 234f52c59..1b0121239 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_a.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_b.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_b.cpp
index f8746513c..f277d1966 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_b.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c01.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c01.cpp
index 71d7c3beb..30cf309af 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c01.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c01.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c02.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c02.cpp
index a4ba62321..fc0e874a9 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c02.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c02.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c03.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c03.cpp
index 26060aa44..6e0b9f9d1 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c03.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c03.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c04.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c04.cpp
index 176931ffd..c8eb7a452 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c04.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c04.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c05.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c05.cpp
index 26eabb85d..7a2ea48f4 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c05.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c05.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c06.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c06.cpp
index 70692911f..1dfb2cdfd 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c06.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c06.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c07.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c07.cpp
index 720b1b4fe..fae45966d 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c07.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c07.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c08.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c08.cpp
index 85d9c8f34..652ff36d7 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c08.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c08.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c09.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c09.cpp
index e20bcac65..dbcc721b7 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c09.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c09.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c10.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c10.cpp
index 2c6fa170e..18ce9f027 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c10.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c10.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c11.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c11.cpp
index 81b0644f7..b1504aff6 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c11.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c11.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c12.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c12.cpp
index 3c9cca7de..2e8ac0ee4 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c12.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c12.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c13.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c13.cpp
index ad0160f4f..f77127164 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c13.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_SubView_c13.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_Team.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_Team.cpp
index fd0e048e0..310335416 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_Team.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_Team.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_TeamReductionScan.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_TeamReductionScan.cpp
index 14a2f628e..4f5cc7e15 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_TeamReductionScan.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_TeamReductionScan.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_TeamScratch.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_TeamScratch.cpp
index 1b92e2379..14a7bb14a 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_TeamScratch.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_TeamScratch.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_TeamTeamSize.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_TeamTeamSize.cpp
index 583e01fcb..a1fc94da4 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_TeamTeamSize.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_TeamTeamSize.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_a.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_a.cpp
index d0a7caad7..86c91410a 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_a.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_b.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_b.cpp
index cef3ad606..37f1efcd0 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_b.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_c.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_c.cpp
index 624fda5a7..287195ad3 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_c.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_d.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_d.cpp
index fbb169828..d5f66de78 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_d.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_e.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_e.cpp
index 1a9f993e7..0d9f3b5e9 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_e.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_a.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_a.cpp
index cc750a820..6cb0a6eb1 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_a.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_b.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_b.cpp
index 90ff04f38..3e3e4ae78 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_b.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_subview.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_subview.cpp
index 1ca512511..4e0729bcb 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_subview.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/rocm/TestROCm_ViewOfClass.cpp b/packages/kokkos/core/unit_test/rocm/TestROCm_ViewOfClass.cpp
index eaebb30e3..1eb08263a 100644
--- a/packages/kokkos/core/unit_test/rocm/TestROCm_ViewOfClass.cpp
+++ b/packages/kokkos/core/unit_test/rocm/TestROCm_ViewOfClass.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexdouble.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexdouble.cpp
index 382df2b03..4b600f0d8 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexdouble.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexdouble.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexfloat.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexfloat.cpp
index 4e0e48d12..f06b30bb0 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexfloat.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexfloat.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_double.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_double.cpp
index 6c2b88028..134e071ba 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_double.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_double.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_float.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_float.cpp
index e143f8a06..031689302 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_float.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_float.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_int.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_int.cpp
index d79d357e7..0b8a9585d 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_int.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_int.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longint.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longint.cpp
index 21b640e1d..deef86625 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longint.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longlongint.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longlongint.cpp
index 39425f783..9128fbcdc 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longlongint.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longlongint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedint.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedint.cpp
index 021123839..cff85fdc7 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedint.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedlongint.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedlongint.cpp
index 45c773226..45d6b27e1 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedlongint.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedlongint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicViews.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicViews.cpp
index b9bcb5d65..2057c8e21 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_AtomicViews.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_AtomicViews.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_Atomics.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_Atomics.cpp
index 3862d0c7a..96dd133c1 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_Atomics.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_Atomics.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_Category.hpp b/packages/kokkos/core/unit_test/serial/TestSerial_Category.hpp
index 4f01e0a92..39ab00178 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_Category.hpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_Complex.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_Complex.cpp
index 22ebff271..316b88482 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_Complex.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_Complex.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_Crs.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_Crs.cpp
index 367c1028a..93dd74ca0 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_Crs.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_Crs.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_DeepCopyAlignment.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_DeepCopyAlignment.cpp
index 8280b49fe..b829882d0 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_DeepCopyAlignment.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_DeepCopyAlignment.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_FunctorAnalysis.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_FunctorAnalysis.cpp
index d196eb4d5..d5d0f1075 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_FunctorAnalysis.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_FunctorAnalysis.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_Init.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_Init.cpp
index e6df5ac93..6dbe35ae2 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_Init.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_Init.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_LocalDeepCopy.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_LocalDeepCopy.cpp
index 46bb2130e..d3af6b3f8 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_LocalDeepCopy.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_LocalDeepCopy.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_a.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_a.cpp
index 8a93232f3..00327cb16 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_a.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_a.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_b.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_b.cpp
index 8f6ac3b1b..1047c6914 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_b.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_b.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_c.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_c.cpp
index f1e17f3ef..bdd501cef 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_c.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_c.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_d.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_d.cpp
index 9f85f57f3..7ec23b29a 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_d.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_d.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_e.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_e.cpp
index 5c750cfd5..5621b9d64 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_e.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_MDRange_e.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_Other.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_Other.cpp
index f0a92d4e8..68902c58a 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_Other.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_Other.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_RangePolicy.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_RangePolicy.cpp
index 947e5fa15..91c48c9ca 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_RangePolicy.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_RangePolicy.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_Reducers_a.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_Reducers_a.cpp
index 2c65bb9bd..8fdd69b10 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_Reducers_a.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_Reducers_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_Reducers_b.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_Reducers_b.cpp
index f1fa81401..1802ce9fe 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_Reducers_b.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_Reducers_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_Reducers_c.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_Reducers_c.cpp
index 4730a2730..f86ca504f 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_Reducers_c.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_Reducers_c.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_Reducers_d.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_Reducers_d.cpp
index 26ea6f7e2..a4608cda8 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_Reducers_d.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_Reducers_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_Reductions.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_Reductions.cpp
index acec0edd6..829e5ac6b 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_Reductions.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_Reductions.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_Reductions_DeviceView.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_Reductions_DeviceView.cpp
index 1c20670c2..4bbe5a299 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_Reductions_DeviceView.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_Reductions_DeviceView.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_Scan.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_Scan.cpp
index 884bc8843..ebc522170 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_Scan.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_Scan.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_SharedAlloc.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_SharedAlloc.cpp
index af2952336..c9ddd2e7e 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_SharedAlloc.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_SharedAlloc.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_a.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_a.cpp
index d93465c41..11bea2df0 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_a.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_b.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_b.cpp
index be39207ed..e3c4c7e74 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_b.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c01.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c01.cpp
index 6cc1bd16b..e98d1f80a 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c01.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c01.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c02.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c02.cpp
index 64236c66f..7003b5971 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c02.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c02.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c03.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c03.cpp
index fa4331635..699f1d8fe 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c03.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c03.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c04.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c04.cpp
index 88a61d2f9..389ff4376 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c04.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c04.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c05.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c05.cpp
index c380371bd..ed457306e 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c05.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c05.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c06.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c06.cpp
index 879ba4385..bc793e81f 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c06.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c06.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c07.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c07.cpp
index 6cdf578fd..271e1aada 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c07.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c07.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c08.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c08.cpp
index 39bbb33a7..e5f6d43e8 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c08.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c08.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c09.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c09.cpp
index 91d2b949e..817b937e8 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c09.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c09.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c10.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c10.cpp
index 1a5ca0243..61cca3ad2 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c10.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c10.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c11.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c11.cpp
index 8187c0a48..984067fcc 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c11.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c11.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c12.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c12.cpp
index c425c5399..13e36f32f 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c12.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c12.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c13.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c13.cpp
index b81c80e06..280f95932 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c13.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_SubView_c13.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_Task.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_Task.cpp
index 493e981eb..9254341f4 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_Task.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_Task.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_Team.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_Team.cpp
index a4c4e26a3..495ba1d5e 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_Team.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_Team.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_TeamReductionScan.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_TeamReductionScan.cpp
index 40b62bfcd..18a64b44e 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_TeamReductionScan.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_TeamReductionScan.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_TeamScratch.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_TeamScratch.cpp
index 2f22b0141..05660933b 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_TeamScratch.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_TeamScratch.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_TeamTeamSize.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_TeamTeamSize.cpp
index 53451b30c..18fe63d38 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_TeamTeamSize.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_TeamTeamSize.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_TeamVectorRange.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_TeamVectorRange.cpp
index 6ac3ddcba..529ba5fa8 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_TeamVectorRange.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_TeamVectorRange.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_UniqueToken.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_UniqueToken.cpp
index b94d4a644..7fc7eba43 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_UniqueToken.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_UniqueToken.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_a.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_a.cpp
index e29363456..7cce7bd11 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_a.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_b.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_b.cpp
index 09c0049d6..a1a386199 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_b.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_c.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_c.cpp
index fdf7f5387..1216ba04e 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_c.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_d.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_d.cpp
index 6380a28db..3d7839832 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_d.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_e.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_e.cpp
index 780ce046b..d5d7f8d8e 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_e.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_ViewLayoutStrideAssignment.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_ViewLayoutStrideAssignment.cpp
index 34d979300..8fcb6a082 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_ViewLayoutStrideAssignment.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_ViewLayoutStrideAssignment.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_ViewMapping_a.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_ViewMapping_a.cpp
index 37c0c844a..59671867f 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_ViewMapping_a.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_ViewMapping_b.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_ViewMapping_b.cpp
index fc8a5d252..8baf563fd 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_ViewMapping_b.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_ViewMapping_subview.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_ViewMapping_subview.cpp
index b567bb1f7..6643ad98d 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_ViewMapping_subview.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_ViewOfClass.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_ViewOfClass.cpp
index dc1592e68..fe14df9e4 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_ViewOfClass.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_ViewOfClass.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_ViewResize.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_ViewResize.cpp
index d734c38fe..d023fa7a8 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_ViewResize.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_ViewResize.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_View_64bit.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_View_64bit.cpp
index ac2edde25..f800b61e0 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_View_64bit.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_View_64bit.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/serial/TestSerial_WorkGraph.cpp b/packages/kokkos/core/unit_test/serial/TestSerial_WorkGraph.cpp
index b569088ae..7a996b74c 100644
--- a/packages/kokkos/core/unit_test/serial/TestSerial_WorkGraph.cpp
+++ b/packages/kokkos/core/unit_test/serial/TestSerial_WorkGraph.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/standalone/UnitTestMainInit.cpp b/packages/kokkos/core/unit_test/standalone/UnitTestMainInit.cpp
index 5d0589cb1..42a49cc11 100644
--- a/packages/kokkos/core/unit_test/standalone/UnitTestMainInit.cpp
+++ b/packages/kokkos/core/unit_test/standalone/UnitTestMainInit.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexdouble.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexdouble.cpp
index c0591b006..c716bb59a 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexdouble.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexdouble.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexfloat.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexfloat.cpp
index 40935922c..e5aa0451c 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexfloat.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexfloat.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_double.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_double.cpp
index 7b3da26de..f1ed95e58 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_double.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_double.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_float.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_float.cpp
index 62275bdbd..518cd2d06 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_float.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_float.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_int.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_int.cpp
index 38accdcc3..a50322917 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_int.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_int.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longint.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longint.cpp
index 3c494104e..c0e69028d 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longint.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longlongint.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longlongint.cpp
index 6f10220fb..e3c34449d 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longlongint.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longlongint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedint.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedint.cpp
index f6b832864..e1311dee1 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedint.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedlongint.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedlongint.cpp
index e120a3edf..e0780c4d4 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedlongint.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedlongint.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicViews.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicViews.cpp
index 7840cbe08..6f90def17 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_AtomicViews.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_AtomicViews.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_Atomics.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_Atomics.cpp
index 73d095242..75de69090 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_Atomics.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_Atomics.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_Category.hpp b/packages/kokkos/core/unit_test/threads/TestThreads_Category.hpp
index 5004e188f..d51925793 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_Category.hpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_Category.hpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_Complex.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_Complex.cpp
index ad12b4ed5..d825e1c31 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_Complex.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_Complex.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_Crs.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_Crs.cpp
index b9cc7cfd2..847815788 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_Crs.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_Crs.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_DeepCopyAlignment.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_DeepCopyAlignment.cpp
index e0f76af4e..f4a32a372 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_DeepCopyAlignment.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_DeepCopyAlignment.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_FunctorAnalysis.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_FunctorAnalysis.cpp
index e2751d8f6..7fe71715e 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_FunctorAnalysis.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_FunctorAnalysis.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_Init.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_Init.cpp
index cc5670992..8eaffe750 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_Init.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_Init.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_LocalDeepCopy.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_LocalDeepCopy.cpp
index 1949f9d93..fefeef729 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_LocalDeepCopy.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_LocalDeepCopy.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_a.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_a.cpp
index d5993e133..9702702ed 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_a.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_a.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_b.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_b.cpp
index 0b6502d38..02db00385 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_b.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_b.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_c.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_c.cpp
index 3c670dccc..b517eda06 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_c.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_c.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_d.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_d.cpp
index 3c4e61c33..d7eea24cd 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_d.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_d.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_e.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_e.cpp
index 375c74d8b..ede23644a 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_e.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_MDRange_e.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_Other.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_Other.cpp
index a919a0362..c381919f5 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_Other.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_Other.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_RangePolicy.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_RangePolicy.cpp
index 64ac46c18..10d5f54cf 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_RangePolicy.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_RangePolicy.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_Reducers_a.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_Reducers_a.cpp
index 6dcf1c8ad..6ef139237 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_Reducers_a.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_Reducers_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_Reducers_b.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_Reducers_b.cpp
index 1893c3d5f..af56b1372 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_Reducers_b.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_Reducers_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_Reducers_c.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_Reducers_c.cpp
index 799de2706..e5772075e 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_Reducers_c.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_Reducers_c.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_Reducers_d.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_Reducers_d.cpp
index 696ae7221..525f74910 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_Reducers_d.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_Reducers_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_Reductions.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_Reductions.cpp
index 33788b9ca..42bc067c3 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_Reductions.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_Reductions.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_Reductions_DeviceView.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_Reductions_DeviceView.cpp
index 28f4b7d57..d659f6f98 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_Reductions_DeviceView.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_Reductions_DeviceView.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_Scan.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_Scan.cpp
index c2ae98639..0bb189bf8 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_Scan.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_Scan.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_SharedAlloc.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_SharedAlloc.cpp
index 9fc185b83..2394fc719 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_SharedAlloc.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_SharedAlloc.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_a.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_a.cpp
index 7962edf88..f61b4649e 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_a.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_b.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_b.cpp
index c392df3e5..81d54e84d 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_b.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c01.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c01.cpp
index 27285a39e..2f28d71e1 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c01.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c01.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c02.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c02.cpp
index ec8f29da8..61bec4019 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c02.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c02.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c03.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c03.cpp
index 8d139e03d..a46856350 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c03.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c03.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c04.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c04.cpp
index b7407fdc4..1f01e9aa4 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c04.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c04.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c05.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c05.cpp
index 436a6c47e..c56bd03d8 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c05.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c05.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c06.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c06.cpp
index 779fcf72c..bc607917f 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c06.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c06.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c07.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c07.cpp
index 5aaa77c59..aa822c7c2 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c07.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c07.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c08.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c08.cpp
index 6d3c16dfd..fd92132ae 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c08.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c08.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c09.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c09.cpp
index 5eac7b355..49b589210 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c09.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c09.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c10.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c10.cpp
index 2ef3aff6f..9adb28e56 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c10.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c10.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c11.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c11.cpp
index b1405a191..ffd01d657 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c11.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c11.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c12.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c12.cpp
index 80b8e6d1c..3f3736609 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c12.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c12.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c13.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c13.cpp
index 7db1699a9..df4da7a37 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c13.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_SubView_c13.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_Team.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_Team.cpp
index 950b4de78..d4fb2df4e 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_Team.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_Team.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_TeamReductionScan.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_TeamReductionScan.cpp
index 4276b81ff..b80c3d795 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_TeamReductionScan.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_TeamReductionScan.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_TeamScratch.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_TeamScratch.cpp
index 277325bf7..12fbbe7ee 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_TeamScratch.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_TeamScratch.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_TeamTeamSize.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_TeamTeamSize.cpp
index 205d9d1ce..cbf9618a8 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_TeamTeamSize.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_TeamTeamSize.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_TeamVectorRange.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_TeamVectorRange.cpp
index c074bf172..c5e24424c 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_TeamVectorRange.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_TeamVectorRange.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_UniqueToken.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_UniqueToken.cpp
index eed9119ca..d0ded3bc5 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_UniqueToken.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_UniqueToken.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_a.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_a.cpp
index 9b8ce4468..cc39ac5e4 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_a.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_b.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_b.cpp
index 454ec9017..80121bb73 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_b.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_c.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_c.cpp
index c63ad3cff..160d27c2c 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_c.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_d.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_d.cpp
index 2b3159156..1a96532f1 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_d.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_e.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_e.cpp
index 616a92349..f803c45fa 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_e.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_ViewLayoutStrideAssignment.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_ViewLayoutStrideAssignment.cpp
index 28efed763..877157d62 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_ViewLayoutStrideAssignment.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_ViewLayoutStrideAssignment.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_ViewMapping_a.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_ViewMapping_a.cpp
index 586210282..658aec977 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_ViewMapping_a.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_ViewMapping_b.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_ViewMapping_b.cpp
index 70da9b77d..e0a014951 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_ViewMapping_b.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_ViewMapping_subview.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_ViewMapping_subview.cpp
index 5959deb97..3c7d42de6 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_ViewMapping_subview.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_ViewOfClass.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_ViewOfClass.cpp
index c1cb6091c..7cb81ca0f 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_ViewOfClass.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_ViewOfClass.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_ViewResize.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_ViewResize.cpp
index c9b435987..6bd67d174 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_ViewResize.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_ViewResize.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_View_64bit.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_View_64bit.cpp
index 5c2d727a4..c5f80760b 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_View_64bit.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_View_64bit.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/core/unit_test/threads/TestThreads_WorkGraph.cpp b/packages/kokkos/core/unit_test/threads/TestThreads_WorkGraph.cpp
index f4070798b..c0cb3c22c 100644
--- a/packages/kokkos/core/unit_test/threads/TestThreads_WorkGraph.cpp
+++ b/packages/kokkos/core/unit_test/threads/TestThreads_WorkGraph.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/build_cmake_in_tree/cmake_example.cpp b/packages/kokkos/example/build_cmake_in_tree/cmake_example.cpp
index 40400c0c0..503587141 100644
--- a/packages/kokkos/example/build_cmake_in_tree/cmake_example.cpp
+++ b/packages/kokkos/example/build_cmake_in_tree/cmake_example.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/build_cmake_installed/cmake_example.cpp b/packages/kokkos/example/build_cmake_installed/cmake_example.cpp
index 40400c0c0..503587141 100644
--- a/packages/kokkos/example/build_cmake_installed/cmake_example.cpp
+++ b/packages/kokkos/example/build_cmake_installed/cmake_example.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/query_device/query_device.cpp b/packages/kokkos/example/query_device/query_device.cpp
index c43b56578..68959cabe 100644
--- a/packages/kokkos/example/query_device/query_device.cpp
+++ b/packages/kokkos/example/query_device/query_device.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/01_hello_world/hello_world.cpp b/packages/kokkos/example/tutorial/01_hello_world/hello_world.cpp
index ed56e5a63..93a571f6b 100644
--- a/packages/kokkos/example/tutorial/01_hello_world/hello_world.cpp
+++ b/packages/kokkos/example/tutorial/01_hello_world/hello_world.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/01_hello_world_lambda/hello_world_lambda.cpp b/packages/kokkos/example/tutorial/01_hello_world_lambda/hello_world_lambda.cpp
index 1ef7e1893..fecb5b87f 100644
--- a/packages/kokkos/example/tutorial/01_hello_world_lambda/hello_world_lambda.cpp
+++ b/packages/kokkos/example/tutorial/01_hello_world_lambda/hello_world_lambda.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/02_simple_reduce/simple_reduce.cpp b/packages/kokkos/example/tutorial/02_simple_reduce/simple_reduce.cpp
index 75fe85537..9eacafa73 100644
--- a/packages/kokkos/example/tutorial/02_simple_reduce/simple_reduce.cpp
+++ b/packages/kokkos/example/tutorial/02_simple_reduce/simple_reduce.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/02_simple_reduce_lambda/simple_reduce_lambda.cpp b/packages/kokkos/example/tutorial/02_simple_reduce_lambda/simple_reduce_lambda.cpp
index 3e420bf27..cc94ef946 100644
--- a/packages/kokkos/example/tutorial/02_simple_reduce_lambda/simple_reduce_lambda.cpp
+++ b/packages/kokkos/example/tutorial/02_simple_reduce_lambda/simple_reduce_lambda.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/03_simple_view/simple_view.cpp b/packages/kokkos/example/tutorial/03_simple_view/simple_view.cpp
index deac25e13..8493e5f7b 100644
--- a/packages/kokkos/example/tutorial/03_simple_view/simple_view.cpp
+++ b/packages/kokkos/example/tutorial/03_simple_view/simple_view.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/03_simple_view_lambda/simple_view_lambda.cpp b/packages/kokkos/example/tutorial/03_simple_view_lambda/simple_view_lambda.cpp
index 3739ce7d7..1ca2cd678 100644
--- a/packages/kokkos/example/tutorial/03_simple_view_lambda/simple_view_lambda.cpp
+++ b/packages/kokkos/example/tutorial/03_simple_view_lambda/simple_view_lambda.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/04_simple_memoryspaces/simple_memoryspaces.cpp b/packages/kokkos/example/tutorial/04_simple_memoryspaces/simple_memoryspaces.cpp
index a3f9501cf..8fcaf8e3c 100644
--- a/packages/kokkos/example/tutorial/04_simple_memoryspaces/simple_memoryspaces.cpp
+++ b/packages/kokkos/example/tutorial/04_simple_memoryspaces/simple_memoryspaces.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/05_simple_atomics/simple_atomics.cpp b/packages/kokkos/example/tutorial/05_simple_atomics/simple_atomics.cpp
index 3052150ee..0d01f1f52 100644
--- a/packages/kokkos/example/tutorial/05_simple_atomics/simple_atomics.cpp
+++ b/packages/kokkos/example/tutorial/05_simple_atomics/simple_atomics.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/06_simple_mdrangepolicy/simple_mdrangepolicy.cpp b/packages/kokkos/example/tutorial/06_simple_mdrangepolicy/simple_mdrangepolicy.cpp
index 4ae5e8ff0..0610f66d3 100644
--- a/packages/kokkos/example/tutorial/06_simple_mdrangepolicy/simple_mdrangepolicy.cpp
+++ b/packages/kokkos/example/tutorial/06_simple_mdrangepolicy/simple_mdrangepolicy.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/Advanced_Views/01_data_layouts/data_layouts.cpp b/packages/kokkos/example/tutorial/Advanced_Views/01_data_layouts/data_layouts.cpp
index bd735bbce..f6de2a279 100644
--- a/packages/kokkos/example/tutorial/Advanced_Views/01_data_layouts/data_layouts.cpp
+++ b/packages/kokkos/example/tutorial/Advanced_Views/01_data_layouts/data_layouts.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/Advanced_Views/02_memory_traits/memory_traits.cpp b/packages/kokkos/example/tutorial/Advanced_Views/02_memory_traits/memory_traits.cpp
index 9664b01b1..36bdced67 100644
--- a/packages/kokkos/example/tutorial/Advanced_Views/02_memory_traits/memory_traits.cpp
+++ b/packages/kokkos/example/tutorial/Advanced_Views/02_memory_traits/memory_traits.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/Advanced_Views/03_subviews/subviews.cpp b/packages/kokkos/example/tutorial/Advanced_Views/03_subviews/subviews.cpp
index 971327f56..4f241c3c7 100644
--- a/packages/kokkos/example/tutorial/Advanced_Views/03_subviews/subviews.cpp
+++ b/packages/kokkos/example/tutorial/Advanced_Views/03_subviews/subviews.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/Advanced_Views/04_dualviews/dual_view.cpp b/packages/kokkos/example/tutorial/Advanced_Views/04_dualviews/dual_view.cpp
index c0c1798c0..42b97a596 100644
--- a/packages/kokkos/example/tutorial/Advanced_Views/04_dualviews/dual_view.cpp
+++ b/packages/kokkos/example/tutorial/Advanced_Views/04_dualviews/dual_view.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/Advanced_Views/05_NVIDIA_UVM/uvm_example.cpp b/packages/kokkos/example/tutorial/Advanced_Views/05_NVIDIA_UVM/uvm_example.cpp
index acdd7154b..58d16dbbf 100644
--- a/packages/kokkos/example/tutorial/Advanced_Views/05_NVIDIA_UVM/uvm_example.cpp
+++ b/packages/kokkos/example/tutorial/Advanced_Views/05_NVIDIA_UVM/uvm_example.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/Advanced_Views/07_Overlapping_DeepCopy/overlapping_deepcopy.cpp b/packages/kokkos/example/tutorial/Advanced_Views/07_Overlapping_DeepCopy/overlapping_deepcopy.cpp
index 182f6bf53..03516ccce 100644
--- a/packages/kokkos/example/tutorial/Advanced_Views/07_Overlapping_DeepCopy/overlapping_deepcopy.cpp
+++ b/packages/kokkos/example/tutorial/Advanced_Views/07_Overlapping_DeepCopy/overlapping_deepcopy.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/Algorithms/01_random_numbers/random_numbers.cpp b/packages/kokkos/example/tutorial/Algorithms/01_random_numbers/random_numbers.cpp
index 2af7a7714..fbf8f3a15 100644
--- a/packages/kokkos/example/tutorial/Algorithms/01_random_numbers/random_numbers.cpp
+++ b/packages/kokkos/example/tutorial/Algorithms/01_random_numbers/random_numbers.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams/thread_teams.cpp b/packages/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams/thread_teams.cpp
index 8278e5f18..df83be870 100644
--- a/packages/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams/thread_teams.cpp
+++ b/packages/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams/thread_teams.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams_lambda/thread_teams_lambda.cpp b/packages/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams_lambda/thread_teams_lambda.cpp
index 9da3b400f..818df598f 100644
--- a/packages/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams_lambda/thread_teams_lambda.cpp
+++ b/packages/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams_lambda/thread_teams_lambda.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/Hierarchical_Parallelism/02_nested_parallel_for/nested_parallel_for.cpp b/packages/kokkos/example/tutorial/Hierarchical_Parallelism/02_nested_parallel_for/nested_parallel_for.cpp
index 9ab93e1b3..befca5eb0 100644
--- a/packages/kokkos/example/tutorial/Hierarchical_Parallelism/02_nested_parallel_for/nested_parallel_for.cpp
+++ b/packages/kokkos/example/tutorial/Hierarchical_Parallelism/02_nested_parallel_for/nested_parallel_for.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/Hierarchical_Parallelism/03_vectorization/vectorization.cpp b/packages/kokkos/example/tutorial/Hierarchical_Parallelism/03_vectorization/vectorization.cpp
index 6d13e70b1..94fe681dd 100644
--- a/packages/kokkos/example/tutorial/Hierarchical_Parallelism/03_vectorization/vectorization.cpp
+++ b/packages/kokkos/example/tutorial/Hierarchical_Parallelism/03_vectorization/vectorization.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/Hierarchical_Parallelism/04_team_scan/team_scan.cpp b/packages/kokkos/example/tutorial/Hierarchical_Parallelism/04_team_scan/team_scan.cpp
index 656f3fc04..331fa9cbd 100644
--- a/packages/kokkos/example/tutorial/Hierarchical_Parallelism/04_team_scan/team_scan.cpp
+++ b/packages/kokkos/example/tutorial/Hierarchical_Parallelism/04_team_scan/team_scan.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/example/tutorial/launch_bounds/launch_bounds_reduce.cpp b/packages/kokkos/example/tutorial/launch_bounds/launch_bounds_reduce.cpp
index 950af0641..a781ff175 100644
--- a/packages/kokkos/example/tutorial/launch_bounds/launch_bounds_reduce.cpp
+++ b/packages/kokkos/example/tutorial/launch_bounds/launch_bounds_reduce.cpp
@@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/master_history.txt b/packages/kokkos/master_history.txt
index e1b9cfcdf..ee5238be8 100644
--- a/packages/kokkos/master_history.txt
+++ b/packages/kokkos/master_history.txt
@@ -17,4 +17,4 @@ tag: 2.7.00 date: 05:24:2018 master: e01945d0 develop: 2d13f608
tag: 2.7.24 date: 11:04:2018 master: d3a94192 develop: 7a06fc81
tag: 2.8.00 date: 02:05:2019 master: 34931a36 develop: d1659d1d
tag: 2.9.00 date: 06:24:2019 master: 5d6e7fb3 develop: 4c6cb80a
-tag: 2.9.99 date: 01:31:2020 master: 2983b80d release-candidate-3.0: fdc904a6
+tag: 3.0.00 date: 01:31:2020 master: 2983b80d release-candidate-3.0: fdc904a6
diff --git a/packages/kokkos/scripts/testing_scripts/TestEXEC_TEST.cpp b/packages/kokkos/scripts/testing_scripts/TestEXEC_TEST.cpp
index 6a11184fd..a87918eea 100644
--- a/packages/kokkos/scripts/testing_scripts/TestEXEC_TEST.cpp
+++ b/packages/kokkos/scripts/testing_scripts/TestEXEC_TEST.cpp
@@ -3,10 +3,11 @@
//@HEADER
// ************************************************************************
//
-// Kokkos v. 2.0
-// Copyright (2014) Sandia Corporation
+// Kokkos v. 3.0
+// Copyright (2020) National Technology & Engineering
+// Solutions of Sandia, LLC (NTESS).
//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/packages/kokkos/scripts/update-copyright b/packages/kokkos/scripts/update-copyright
new file mode 100755
index 000000000..2454bc678
--- /dev/null
+++ b/packages/kokkos/scripts/update-copyright
@@ -0,0 +1,5 @@
+files=`find . -name '*.cpp' -o -name '*.pc.in' -o -name '*.hpp' -o -name 'LICENSE' -o -name 'Copyright.txt' -o -name '*.cc'`
+for file in $files; do
+awk '{if($2=="Copyright" && $3=="(2014)" && $4=="Sandia" && $5=="Corporation") {print "// Copyright (2020) National Technology & Engineering"; print "// Solutions of Sandia, LLC (NTESS).";} else {print $0}}' $file | sed 's/DE-AC04-94AL85000 with Sandia Corporation/DE-NA0003525 with NTESS/g' | sed 's|Kokkos v. 2.0|Kokkos v. 3.0|g' &> tmp
+cp tmp $file
+done
--
GitLab