diff --git a/atlas-akka/src/main/scala/com/netflix/atlas/akka/ConfigApi.scala b/atlas-akka/src/main/scala/com/netflix/atlas/akka/ConfigApi.scala
index 1923ee675..bf9f8fa71 100644
--- a/atlas-akka/src/main/scala/com/netflix/atlas/akka/ConfigApi.scala
+++ b/atlas-akka/src/main/scala/com/netflix/atlas/akka/ConfigApi.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-akka/src/main/scala/com/netflix/atlas/akka/CustomDirectives.scala b/atlas-akka/src/main/scala/com/netflix/atlas/akka/CustomDirectives.scala
index 71a95bf20..3023b2853 100644
--- a/atlas-akka/src/main/scala/com/netflix/atlas/akka/CustomDirectives.scala
+++ b/atlas-akka/src/main/scala/com/netflix/atlas/akka/CustomDirectives.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-akka/src/main/scala/com/netflix/atlas/akka/CustomMediaTypes.scala b/atlas-akka/src/main/scala/com/netflix/atlas/akka/CustomMediaTypes.scala
index 8c70cb2a6..6c52fd108 100644
--- a/atlas-akka/src/main/scala/com/netflix/atlas/akka/CustomMediaTypes.scala
+++ b/atlas-akka/src/main/scala/com/netflix/atlas/akka/CustomMediaTypes.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-akka/src/main/scala/com/netflix/atlas/akka/DiagnosticMessage.scala b/atlas-akka/src/main/scala/com/netflix/atlas/akka/DiagnosticMessage.scala
index 12e3c80a3..e07d9b551 100644
--- a/atlas-akka/src/main/scala/com/netflix/atlas/akka/DiagnosticMessage.scala
+++ b/atlas-akka/src/main/scala/com/netflix/atlas/akka/DiagnosticMessage.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-akka/src/main/scala/com/netflix/atlas/akka/Paths.scala b/atlas-akka/src/main/scala/com/netflix/atlas/akka/Paths.scala
index 9209d8e38..547efae1a 100644
--- a/atlas-akka/src/main/scala/com/netflix/atlas/akka/Paths.scala
+++ b/atlas-akka/src/main/scala/com/netflix/atlas/akka/Paths.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-akka/src/main/scala/com/netflix/atlas/akka/RequestHandlerActor.scala b/atlas-akka/src/main/scala/com/netflix/atlas/akka/RequestHandlerActor.scala
index 7ce0d9aa4..e970ec691 100644
--- a/atlas-akka/src/main/scala/com/netflix/atlas/akka/RequestHandlerActor.scala
+++ b/atlas-akka/src/main/scala/com/netflix/atlas/akka/RequestHandlerActor.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-akka/src/main/scala/com/netflix/atlas/akka/ServerStats.scala b/atlas-akka/src/main/scala/com/netflix/atlas/akka/ServerStats.scala
index 16693603e..85f3c5203 100644
--- a/atlas-akka/src/main/scala/com/netflix/atlas/akka/ServerStats.scala
+++ b/atlas-akka/src/main/scala/com/netflix/atlas/akka/ServerStats.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-akka/src/main/scala/com/netflix/atlas/akka/StaticPages.scala b/atlas-akka/src/main/scala/com/netflix/atlas/akka/StaticPages.scala
index 37412fb44..2a627fffc 100644
--- a/atlas-akka/src/main/scala/com/netflix/atlas/akka/StaticPages.scala
+++ b/atlas-akka/src/main/scala/com/netflix/atlas/akka/StaticPages.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-akka/src/main/scala/com/netflix/atlas/akka/UnboundedMeteredMailbox.scala b/atlas-akka/src/main/scala/com/netflix/atlas/akka/UnboundedMeteredMailbox.scala
index b7ffcf887..3f4d78a6b 100644
--- a/atlas-akka/src/main/scala/com/netflix/atlas/akka/UnboundedMeteredMailbox.scala
+++ b/atlas-akka/src/main/scala/com/netflix/atlas/akka/UnboundedMeteredMailbox.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-akka/src/main/scala/com/netflix/atlas/akka/WebApi.scala b/atlas-akka/src/main/scala/com/netflix/atlas/akka/WebApi.scala
index 27608438b..1ef3e30be 100644
--- a/atlas-akka/src/main/scala/com/netflix/atlas/akka/WebApi.scala
+++ b/atlas-akka/src/main/scala/com/netflix/atlas/akka/WebApi.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-akka/src/main/scala/com/netflix/atlas/akka/WebServer.scala b/atlas-akka/src/main/scala/com/netflix/atlas/akka/WebServer.scala
index 8527cff4c..fb41f185e 100644
--- a/atlas-akka/src/main/scala/com/netflix/atlas/akka/WebServer.scala
+++ b/atlas-akka/src/main/scala/com/netflix/atlas/akka/WebServer.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-akka/src/test/scala/com/netflix/atlas/akka/ConfigApiSuite.scala b/atlas-akka/src/test/scala/com/netflix/atlas/akka/ConfigApiSuite.scala
index d4c387526..eb5d47830 100644
--- a/atlas-akka/src/test/scala/com/netflix/atlas/akka/ConfigApiSuite.scala
+++ b/atlas-akka/src/test/scala/com/netflix/atlas/akka/ConfigApiSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-akka/src/test/scala/com/netflix/atlas/akka/CustomDirectivesSuite.scala b/atlas-akka/src/test/scala/com/netflix/atlas/akka/CustomDirectivesSuite.scala
index 31e643d25..cc65bea9f 100644
--- a/atlas-akka/src/test/scala/com/netflix/atlas/akka/CustomDirectivesSuite.scala
+++ b/atlas-akka/src/test/scala/com/netflix/atlas/akka/CustomDirectivesSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-akka/src/test/scala/com/netflix/atlas/akka/RequestHandlerActorSuite.scala b/atlas-akka/src/test/scala/com/netflix/atlas/akka/RequestHandlerActorSuite.scala
index f404ed9aa..9966796d8 100644
--- a/atlas-akka/src/test/scala/com/netflix/atlas/akka/RequestHandlerActorSuite.scala
+++ b/atlas-akka/src/test/scala/com/netflix/atlas/akka/RequestHandlerActorSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-akka/src/test/scala/com/netflix/atlas/akka/ServerStatsSuite.scala b/atlas-akka/src/test/scala/com/netflix/atlas/akka/ServerStatsSuite.scala
index 854f5e531..1d6e32bee 100644
--- a/atlas-akka/src/test/scala/com/netflix/atlas/akka/ServerStatsSuite.scala
+++ b/atlas-akka/src/test/scala/com/netflix/atlas/akka/ServerStatsSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-akka/src/test/scala/com/netflix/atlas/akka/StaticPagesSuite.scala b/atlas-akka/src/test/scala/com/netflix/atlas/akka/StaticPagesSuite.scala
index a2b583198..fc4d9aed8 100644
--- a/atlas-akka/src/test/scala/com/netflix/atlas/akka/StaticPagesSuite.scala
+++ b/atlas-akka/src/test/scala/com/netflix/atlas/akka/StaticPagesSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-akka/src/test/scala/com/netflix/atlas/akka/TestApi.scala b/atlas-akka/src/test/scala/com/netflix/atlas/akka/TestApi.scala
index 46f48dc79..e4c94ba6a 100644
--- a/atlas-akka/src/test/scala/com/netflix/atlas/akka/TestApi.scala
+++ b/atlas-akka/src/test/scala/com/netflix/atlas/akka/TestApi.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-aws/src/main/scala/com/netflix/atlas/aws/AwsClientFactory.scala b/atlas-aws/src/main/scala/com/netflix/atlas/aws/AwsClientFactory.scala
index 3bd198f86..a00954be6 100644
--- a/atlas-aws/src/main/scala/com/netflix/atlas/aws/AwsClientFactory.scala
+++ b/atlas-aws/src/main/scala/com/netflix/atlas/aws/AwsClientFactory.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-aws/src/main/scala/com/netflix/atlas/aws/DefaultAwsClientFactory.scala b/atlas-aws/src/main/scala/com/netflix/atlas/aws/DefaultAwsClientFactory.scala
index cbf63959b..663167517 100644
--- a/atlas-aws/src/main/scala/com/netflix/atlas/aws/DefaultAwsClientFactory.scala
+++ b/atlas-aws/src/main/scala/com/netflix/atlas/aws/DefaultAwsClientFactory.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-aws/src/main/scala/com/netflix/atlas/aws/FileCredentialsProvider.scala b/atlas-aws/src/main/scala/com/netflix/atlas/aws/FileCredentialsProvider.scala
index 3ef8688af..7fbd400d8 100644
--- a/atlas-aws/src/main/scala/com/netflix/atlas/aws/FileCredentialsProvider.scala
+++ b/atlas-aws/src/main/scala/com/netflix/atlas/aws/FileCredentialsProvider.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-aws/src/test/scala/com/netflix/atlas/aws/AwsClientFactorySuite.scala b/atlas-aws/src/test/scala/com/netflix/atlas/aws/AwsClientFactorySuite.scala
index 6abe81bfe..476b227bc 100644
--- a/atlas-aws/src/test/scala/com/netflix/atlas/aws/AwsClientFactorySuite.scala
+++ b/atlas-aws/src/test/scala/com/netflix/atlas/aws/AwsClientFactorySuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-aws/src/test/scala/com/netflix/atlas/aws/DefaultAwsClientFactorySuite.scala b/atlas-aws/src/test/scala/com/netflix/atlas/aws/DefaultAwsClientFactorySuite.scala
index f1d51b2a5..c4162bf85 100644
--- a/atlas-aws/src/test/scala/com/netflix/atlas/aws/DefaultAwsClientFactorySuite.scala
+++ b/atlas-aws/src/test/scala/com/netflix/atlas/aws/DefaultAwsClientFactorySuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-chart/src/main/scala/com/netflix/atlas/chart/Colors.scala b/atlas-chart/src/main/scala/com/netflix/atlas/chart/Colors.scala
index aada33675..0e562ac6f 100644
--- a/atlas-chart/src/main/scala/com/netflix/atlas/chart/Colors.scala
+++ b/atlas-chart/src/main/scala/com/netflix/atlas/chart/Colors.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-chart/src/main/scala/com/netflix/atlas/chart/CommaSepGraphEngine.scala b/atlas-chart/src/main/scala/com/netflix/atlas/chart/CommaSepGraphEngine.scala
index 1b1bae1d4..1d0972033 100644
--- a/atlas-chart/src/main/scala/com/netflix/atlas/chart/CommaSepGraphEngine.scala
+++ b/atlas-chart/src/main/scala/com/netflix/atlas/chart/CommaSepGraphEngine.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-chart/src/main/scala/com/netflix/atlas/chart/CsvGraphEngine.scala b/atlas-chart/src/main/scala/com/netflix/atlas/chart/CsvGraphEngine.scala
index 32b6407fd..e940d6b2e 100644
--- a/atlas-chart/src/main/scala/com/netflix/atlas/chart/CsvGraphEngine.scala
+++ b/atlas-chart/src/main/scala/com/netflix/atlas/chart/CsvGraphEngine.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-chart/src/main/scala/com/netflix/atlas/chart/GraphConstants.scala b/atlas-chart/src/main/scala/com/netflix/atlas/chart/GraphConstants.scala
index f01ade92f..23c739e0f 100644
--- a/atlas-chart/src/main/scala/com/netflix/atlas/chart/GraphConstants.scala
+++ b/atlas-chart/src/main/scala/com/netflix/atlas/chart/GraphConstants.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-chart/src/main/scala/com/netflix/atlas/chart/GraphEngine.scala b/atlas-chart/src/main/scala/com/netflix/atlas/chart/GraphEngine.scala
index ad55f2060..0710e43e5 100644
--- a/atlas-chart/src/main/scala/com/netflix/atlas/chart/GraphEngine.scala
+++ b/atlas-chart/src/main/scala/com/netflix/atlas/chart/GraphEngine.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-chart/src/main/scala/com/netflix/atlas/chart/JsonGraphEngine.scala b/atlas-chart/src/main/scala/com/netflix/atlas/chart/JsonGraphEngine.scala
index 7b62c9927..5a6967a34 100644
--- a/atlas-chart/src/main/scala/com/netflix/atlas/chart/JsonGraphEngine.scala
+++ b/atlas-chart/src/main/scala/com/netflix/atlas/chart/JsonGraphEngine.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-chart/src/main/scala/com/netflix/atlas/chart/LineStyle.java b/atlas-chart/src/main/scala/com/netflix/atlas/chart/LineStyle.java
index f25a12519..81f47e8be 100644
--- a/atlas-chart/src/main/scala/com/netflix/atlas/chart/LineStyle.java
+++ b/atlas-chart/src/main/scala/com/netflix/atlas/chart/LineStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-chart/src/main/scala/com/netflix/atlas/chart/Notice.scala b/atlas-chart/src/main/scala/com/netflix/atlas/chart/Notice.scala
index e81fbe69e..34a851f78 100644
--- a/atlas-chart/src/main/scala/com/netflix/atlas/chart/Notice.scala
+++ b/atlas-chart/src/main/scala/com/netflix/atlas/chart/Notice.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-chart/src/main/scala/com/netflix/atlas/chart/Palette.scala b/atlas-chart/src/main/scala/com/netflix/atlas/chart/Palette.scala
index af5f3cc0c..defc9ec6d 100644
--- a/atlas-chart/src/main/scala/com/netflix/atlas/chart/Palette.scala
+++ b/atlas-chart/src/main/scala/com/netflix/atlas/chart/Palette.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-chart/src/main/scala/com/netflix/atlas/chart/PngGraphEngine.scala b/atlas-chart/src/main/scala/com/netflix/atlas/chart/PngGraphEngine.scala
index 9bc60b279..992dcbe57 100644
--- a/atlas-chart/src/main/scala/com/netflix/atlas/chart/PngGraphEngine.scala
+++ b/atlas-chart/src/main/scala/com/netflix/atlas/chart/PngGraphEngine.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-chart/src/main/scala/com/netflix/atlas/chart/Rrd4jGraphEngine.scala b/atlas-chart/src/main/scala/com/netflix/atlas/chart/Rrd4jGraphEngine.scala
index c6adb33c7..6df03a810 100644
--- a/atlas-chart/src/main/scala/com/netflix/atlas/chart/Rrd4jGraphEngine.scala
+++ b/atlas-chart/src/main/scala/com/netflix/atlas/chart/Rrd4jGraphEngine.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-chart/src/main/scala/com/netflix/atlas/chart/StatsJsonGraphEngine.scala b/atlas-chart/src/main/scala/com/netflix/atlas/chart/StatsJsonGraphEngine.scala
index 7eb562d83..f91137430 100644
--- a/atlas-chart/src/main/scala/com/netflix/atlas/chart/StatsJsonGraphEngine.scala
+++ b/atlas-chart/src/main/scala/com/netflix/atlas/chart/StatsJsonGraphEngine.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-chart/src/main/scala/com/netflix/atlas/chart/TabSepGraphEngine.scala b/atlas-chart/src/main/scala/com/netflix/atlas/chart/TabSepGraphEngine.scala
index 444d74dbe..72341907e 100644
--- a/atlas-chart/src/main/scala/com/netflix/atlas/chart/TabSepGraphEngine.scala
+++ b/atlas-chart/src/main/scala/com/netflix/atlas/chart/TabSepGraphEngine.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-chart/src/main/scala/com/netflix/atlas/chart/VisionType.java b/atlas-chart/src/main/scala/com/netflix/atlas/chart/VisionType.java
index 6a0d00e36..ed098a72a 100644
--- a/atlas-chart/src/main/scala/com/netflix/atlas/chart/VisionType.java
+++ b/atlas-chart/src/main/scala/com/netflix/atlas/chart/VisionType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-chart/src/test/scala/com/netflix/atlas/chart/ColorsSuite.scala b/atlas-chart/src/test/scala/com/netflix/atlas/chart/ColorsSuite.scala
index d8f92793a..bf6d04801 100644
--- a/atlas-chart/src/test/scala/com/netflix/atlas/chart/ColorsSuite.scala
+++ b/atlas-chart/src/test/scala/com/netflix/atlas/chart/ColorsSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-chart/src/test/scala/com/netflix/atlas/chart/PngGraphEngineSuite.scala b/atlas-chart/src/test/scala/com/netflix/atlas/chart/PngGraphEngineSuite.scala
index e0e509129..33930a2b6 100644
--- a/atlas-chart/src/test/scala/com/netflix/atlas/chart/PngGraphEngineSuite.scala
+++ b/atlas-chart/src/test/scala/com/netflix/atlas/chart/PngGraphEngineSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-chart/src/test/scala/com/netflix/atlas/chart/Rrd4jGraphEngineSuite.scala b/atlas-chart/src/test/scala/com/netflix/atlas/chart/Rrd4jGraphEngineSuite.scala
index 1c3a1221c..74b7a51a1 100644
--- a/atlas-chart/src/test/scala/com/netflix/atlas/chart/Rrd4jGraphEngineSuite.scala
+++ b/atlas-chart/src/test/scala/com/netflix/atlas/chart/Rrd4jGraphEngineSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-config/src/main/scala/com/netflix/atlas/config/ConfigManager.scala b/atlas-config/src/main/scala/com/netflix/atlas/config/ConfigManager.scala
index 8d2ee0d8e..75d993c3d 100644
--- a/atlas-config/src/main/scala/com/netflix/atlas/config/ConfigManager.scala
+++ b/atlas-config/src/main/scala/com/netflix/atlas/config/ConfigManager.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-config/src/test/scala/com/netflix/atlas/config/ConfigManagerSuite.scala b/atlas-config/src/test/scala/com/netflix/atlas/config/ConfigManagerSuite.scala
index 696ac3779..96559e29c 100644
--- a/atlas-config/src/test/scala/com/netflix/atlas/config/ConfigManagerSuite.scala
+++ b/atlas-config/src/test/scala/com/netflix/atlas/config/ConfigManagerSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/db/AggregateCollector.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/db/AggregateCollector.scala
index 604a25362..45c9c79f9 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/db/AggregateCollector.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/db/AggregateCollector.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/db/BlockStore.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/db/BlockStore.scala
index fd1f5e81e..45157ec04 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/db/BlockStore.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/db/BlockStore.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/db/BlockStoreItem.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/db/BlockStoreItem.scala
index e3bac945a..6e1219f96 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/db/BlockStoreItem.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/db/BlockStoreItem.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/db/DataSet.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/db/DataSet.scala
index 72bcfe0fe..b7d8a06f6 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/db/DataSet.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/db/DataSet.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/db/Database.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/db/Database.scala
index acef7c1ea..f85177082 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/db/Database.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/db/Database.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/db/Limits.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/db/Limits.scala
index 4cb3e941f..1dcb560fc 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/db/Limits.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/db/Limits.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/db/MemoryDatabase.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/db/MemoryDatabase.scala
index f31748d5a..eccaef0d6 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/db/MemoryDatabase.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/db/MemoryDatabase.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/db/StaticDatabase.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/db/StaticDatabase.scala
index 28d53015c..31605a816 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/db/StaticDatabase.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/db/StaticDatabase.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/db/TimeSeriesBuffer.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/db/TimeSeriesBuffer.scala
index 76fa6e35c..f3133013a 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/db/TimeSeriesBuffer.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/db/TimeSeriesBuffer.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/index/BatchUpdateTagIndex.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/index/BatchUpdateTagIndex.scala
index 14c60ed85..f8bf63e0f 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/index/BatchUpdateTagIndex.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/index/BatchUpdateTagIndex.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/index/CachingTagIndex.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/index/CachingTagIndex.scala
index 27d46d654..d410cfdd7 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/index/CachingTagIndex.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/index/CachingTagIndex.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/index/LazySet.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/index/LazySet.scala
index 175005602..97dc5c0ed 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/index/LazySet.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/index/LazySet.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/index/LazyTagIndex.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/index/LazyTagIndex.scala
index 016369c8c..bc7c21fe7 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/index/LazyTagIndex.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/index/LazyTagIndex.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/index/SimpleTagIndex.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/index/SimpleTagIndex.scala
index 4d0a1f669..7522748f0 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/index/SimpleTagIndex.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/index/SimpleTagIndex.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/index/TagIndex.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/index/TagIndex.scala
index 66282bacc..00420236f 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/index/TagIndex.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/index/TagIndex.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/index/TagQuery.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/index/TagQuery.scala
index f8c781693..ddbc5d76e 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/index/TagQuery.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/index/TagQuery.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/Block.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/Block.scala
index 56839158f..603252142 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/Block.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/Block.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/CollectorStats.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/CollectorStats.scala
index 97740cc71..29008d158 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/CollectorStats.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/CollectorStats.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/ConsolidationFunction.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/ConsolidationFunction.scala
index 8202e16d0..db8211084 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/ConsolidationFunction.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/ConsolidationFunction.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/DataExpr.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/DataExpr.scala
index 27c8e0838..27dc8315c 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/DataExpr.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/DataExpr.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/DataVocabulary.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/DataVocabulary.scala
index eb9488018..60e215f94 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/DataVocabulary.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/DataVocabulary.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/Datapoint.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/Datapoint.scala
index 67bc15463..add22124b 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/Datapoint.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/Datapoint.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/DefaultSettings.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/DefaultSettings.scala
index 8c2c2755e..6e6a262d9 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/DefaultSettings.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/DefaultSettings.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/DsType.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/DsType.scala
index f180d940f..acd2cc9c3 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/DsType.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/DsType.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/EvalContext.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/EvalContext.scala
index f517749c6..ad6c2f5f7 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/EvalContext.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/EvalContext.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/Expr.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/Expr.scala
index 7c0746fbd..33f0e1ead 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/Expr.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/Expr.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/Extractors.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/Extractors.scala
index e18faa622..ab96628fc 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/Extractors.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/Extractors.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/FilterExpr.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/FilterExpr.scala
index 7ce862452..139a39a93 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/FilterExpr.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/FilterExpr.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/FilterVocabulary.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/FilterVocabulary.scala
index 0620a268a..2a623d5b9 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/FilterVocabulary.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/FilterVocabulary.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/MathExpr.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/MathExpr.scala
index 6f4775c71..dd3082134 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/MathExpr.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/MathExpr.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/MathVocabulary.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/MathVocabulary.scala
index da787e6be..11918a61e 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/MathVocabulary.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/MathVocabulary.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/Query.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/Query.scala
index b9a2d1091..f9e05279d 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/Query.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/Query.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/QueryVocabulary.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/QueryVocabulary.scala
index 68b07bf38..92871e933 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/QueryVocabulary.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/QueryVocabulary.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/ResultSet.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/ResultSet.scala
index 0db9a5d03..4a6ce3961 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/ResultSet.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/ResultSet.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/StatefulExpr.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/StatefulExpr.scala
index 193fd3a92..ef7277431 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/StatefulExpr.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/StatefulExpr.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/StatefulVocabulary.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/StatefulVocabulary.scala
index a15859c39..4f8f23a62 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/StatefulVocabulary.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/StatefulVocabulary.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/StyleExpr.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/StyleExpr.scala
index e0975e152..9f067a286 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/StyleExpr.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/StyleExpr.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/StyleVocabulary.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/StyleVocabulary.scala
index b47b6407e..4458f7c50 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/StyleVocabulary.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/StyleVocabulary.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/SummaryStats.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/SummaryStats.scala
index 98c6163b5..0b0dad4fb 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/SummaryStats.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/SummaryStats.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/Tag.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/Tag.scala
index bff9b0a86..72166611b 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/Tag.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/Tag.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/TagKey.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/TagKey.scala
index 055fe3340..34630b938 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/TagKey.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/TagKey.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/TaggedItem.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/TaggedItem.scala
index 28239f890..7f4c954e1 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/TaggedItem.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/TaggedItem.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/TimeSeq.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/TimeSeq.scala
index c6654b013..a68025217 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/TimeSeq.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/TimeSeq.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/TimeSeries.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/TimeSeries.scala
index 07c33fa5a..16b23a60a 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/TimeSeries.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/TimeSeries.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/TimeSeriesExpr.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/TimeSeriesExpr.scala
index 257fb57b6..284908790 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/TimeSeriesExpr.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/TimeSeriesExpr.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/model/package.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/model/package.scala
index 46ad81044..189f0ce1e 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/model/package.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/model/package.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/norm/LastValueFunction.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/norm/LastValueFunction.scala
index a9c92d9a1..382bdff51 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/norm/LastValueFunction.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/norm/LastValueFunction.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/norm/NormalizationCache.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/norm/NormalizationCache.scala
index e37bdbc7c..4291e0f1b 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/norm/NormalizationCache.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/norm/NormalizationCache.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/norm/NormalizeValueFunction.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/norm/NormalizeValueFunction.scala
index 1cb0433ee..d8f0ec53e 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/norm/NormalizeValueFunction.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/norm/NormalizeValueFunction.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/norm/RateValueFunction.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/norm/RateValueFunction.scala
index 970bdf2e7..9c4fb93f7 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/norm/RateValueFunction.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/norm/RateValueFunction.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/norm/UpdateValueFunction.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/norm/UpdateValueFunction.scala
index b0006b60f..d1142deec 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/norm/UpdateValueFunction.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/norm/UpdateValueFunction.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/norm/ValueFunction.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/norm/ValueFunction.scala
index c2d302c95..56d7419f9 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/norm/ValueFunction.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/norm/ValueFunction.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/Context.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/Context.scala
index 3777a876b..5cad460f1 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/Context.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/Context.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/Interpreter.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/Interpreter.scala
index 29540add4..a6df3f915 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/Interpreter.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/Interpreter.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/StandardVocabulary.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/StandardVocabulary.scala
index 2d61ac4b5..ae12b54c8 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/StandardVocabulary.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/StandardVocabulary.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/Vocabulary.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/Vocabulary.scala
index 905c63660..57fe05687 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/Vocabulary.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/Vocabulary.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/Word.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/Word.scala
index ef6b5a339..695d8fad7 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/Word.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/stacklang/Word.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/util/ArrayHelper.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/util/ArrayHelper.scala
index bbc5d43f7..02f950d9b 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/util/ArrayHelper.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/util/ArrayHelper.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/util/Hash.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/util/Hash.scala
index 86fbefc3b..4536dd66a 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/util/Hash.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/util/Hash.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/util/InternMap.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/util/InternMap.scala
index 9a6f3a341..ab3b79210 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/util/InternMap.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/util/InternMap.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/util/Interner.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/util/Interner.scala
index be39adca7..2332a3b57 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/util/Interner.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/util/Interner.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/util/Math.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/util/Math.scala
index 0ed998c90..866a80846 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/util/Math.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/util/Math.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/util/PngImage.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/util/PngImage.scala
index e91e6504c..a23bf70ab 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/util/PngImage.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/util/PngImage.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/util/PrimeFinder.java b/atlas-core/src/main/scala/com/netflix/atlas/core/util/PrimeFinder.java
index 7566b1544..24c255e4f 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/util/PrimeFinder.java
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/util/PrimeFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/util/SmallHashMap.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/util/SmallHashMap.scala
index 3c61d6c92..11626dffe 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/util/SmallHashMap.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/util/SmallHashMap.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/util/Step.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/util/Step.scala
index 886626a90..1ecc9ce2b 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/util/Step.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/util/Step.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/util/Streams.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/util/Streams.scala
index c48a37af8..681438524 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/util/Streams.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/util/Streams.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/util/StringMatcher.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/util/StringMatcher.scala
index d8f2bad9c..e05afe01c 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/util/StringMatcher.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/util/StringMatcher.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/util/Strings.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/util/Strings.scala
index 3abe37ef6..d7624a2f3 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/util/Strings.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/util/Strings.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/util/UnitPrefix.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/util/UnitPrefix.scala
index 9f03139df..6dd82ea7f 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/util/UnitPrefix.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/util/UnitPrefix.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/HasKeyRule.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/HasKeyRule.scala
index 84a9c12fe..849702883 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/HasKeyRule.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/HasKeyRule.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/KeyLengthRule.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/KeyLengthRule.scala
index bc6cbcdde..4b3093a31 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/KeyLengthRule.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/KeyLengthRule.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/KeyPatternRule.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/KeyPatternRule.scala
index d7b71eb11..d32bcaa5c 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/KeyPatternRule.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/KeyPatternRule.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/MaxUserTagsRule.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/MaxUserTagsRule.scala
index 0abe9e332..04e448dac 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/MaxUserTagsRule.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/MaxUserTagsRule.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/NonStandardKeyRule.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/NonStandardKeyRule.scala
index 1a527fd8a..114d6cee5 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/NonStandardKeyRule.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/NonStandardKeyRule.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/Rule.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/Rule.scala
index cf01da53e..0f85efd16 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/Rule.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/Rule.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/TagRule.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/TagRule.scala
index 2ec4e89de..aa856106b 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/TagRule.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/TagRule.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/ValidCharactersRule.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/ValidCharactersRule.scala
index 3163f195c..20557bec5 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/ValidCharactersRule.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/ValidCharactersRule.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/ValidationResult.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/ValidationResult.scala
index d3306930a..4f15723ea 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/ValidationResult.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/ValidationResult.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/ValueLengthRule.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/ValueLengthRule.scala
index d76c621d0..8db63313b 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/ValueLengthRule.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/ValueLengthRule.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/ValuePatternRule.scala b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/ValuePatternRule.scala
index 05e015ebb..fd9c37cce 100644
--- a/atlas-core/src/main/scala/com/netflix/atlas/core/validation/ValuePatternRule.scala
+++ b/atlas-core/src/main/scala/com/netflix/atlas/core/validation/ValuePatternRule.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/db/AggregateCollectorSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/db/AggregateCollectorSuite.scala
index 407e27396..51857dc14 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/db/AggregateCollectorSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/db/AggregateCollectorSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/db/MemoryBlockStoreSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/db/MemoryBlockStoreSuite.scala
index 9367082ed..830f084c7 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/db/MemoryBlockStoreSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/db/MemoryBlockStoreSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/db/MemoryDatabaseSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/db/MemoryDatabaseSuite.scala
index 77a440462..c5aa2a78c 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/db/MemoryDatabaseSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/db/MemoryDatabaseSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/db/TimeSeriesBufferSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/db/TimeSeriesBufferSuite.scala
index 5e178c81b..c1ef98d58 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/db/TimeSeriesBufferSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/db/TimeSeriesBufferSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/index/BatchUpdateTagIndexSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/index/BatchUpdateTagIndexSuite.scala
index 33efeb2fa..679c74755 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/index/BatchUpdateTagIndexSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/index/BatchUpdateTagIndexSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/index/DataSet.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/index/DataSet.scala
index 3cd717f63..46ebcaeeb 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/index/DataSet.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/index/DataSet.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/index/LazySetSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/index/LazySetSuite.scala
index 0dcdba73e..3b28c750b 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/index/LazySetSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/index/LazySetSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/index/LazyTagIndexSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/index/LazyTagIndexSuite.scala
index 2e71daf48..530edbd2c 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/index/LazyTagIndexSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/index/LazyTagIndexSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/index/SimpleTagIndexSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/index/SimpleTagIndexSuite.scala
index 29654c3fd..40d71309b 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/index/SimpleTagIndexSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/index/SimpleTagIndexSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/index/TagIndexSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/index/TagIndexSuite.scala
index 21f4bb59b..82d09de5b 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/index/TagIndexSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/index/TagIndexSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/model/AndWordSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/model/AndWordSuite.scala
index 577de5db5..d103c10f2 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/model/AndWordSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/model/AndWordSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/model/ArrayTimeSeqSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/model/ArrayTimeSeqSuite.scala
index bfb3669e9..2d3c9f074 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/model/ArrayTimeSeqSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/model/ArrayTimeSeqSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/model/BlockSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/model/BlockSuite.scala
index d918157e0..80e87b7ae 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/model/BlockSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/model/BlockSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/model/DataExamplesSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/model/DataExamplesSuite.scala
index 4844d9487..a926ae0db 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/model/DataExamplesSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/model/DataExamplesSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/model/FilterExamplesSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/model/FilterExamplesSuite.scala
index 263baa645..41699ec14 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/model/FilterExamplesSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/model/FilterExamplesSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/model/InWordSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/model/InWordSuite.scala
index f2dec2a50..b50cad686 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/model/InWordSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/model/InWordSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/model/MapStepTimeSeqSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/model/MapStepTimeSeqSuite.scala
index 614c3cedb..06851b033 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/model/MapStepTimeSeqSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/model/MapStepTimeSeqSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/model/MathExamplesSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/model/MathExamplesSuite.scala
index 88f9dbe80..e97530c69 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/model/MathExamplesSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/model/MathExamplesSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/model/NotWordSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/model/NotWordSuite.scala
index 0d45628b7..4dc6cf676 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/model/NotWordSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/model/NotWordSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/model/OrWordSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/model/OrWordSuite.scala
index 0726ef0a7..8d8040eeb 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/model/OrWordSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/model/OrWordSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/model/QueryExamplesSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/model/QueryExamplesSuite.scala
index 8b07255fc..6961298c6 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/model/QueryExamplesSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/model/QueryExamplesSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/model/QuerySuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/model/QuerySuite.scala
index dfbcad487..bbdc9ef14 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/model/QuerySuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/model/QuerySuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/model/StatefulExamplesSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/model/StatefulExamplesSuite.scala
index cce78d40d..fdf0d6da2 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/model/StatefulExamplesSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/model/StatefulExamplesSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/model/StyleExamplesSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/model/StyleExamplesSuite.scala
index e1257de65..326f0c383 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/model/StyleExamplesSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/model/StyleExamplesSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/model/StyleExprSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/model/StyleExprSuite.scala
index 92dfd4d78..70a7d3a36 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/model/StyleExprSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/model/StyleExprSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/model/TimeSeriesExprSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/model/TimeSeriesExprSuite.scala
index e0e08e30e..44e9050f6 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/model/TimeSeriesExprSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/model/TimeSeriesExprSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/norm/LastValueFunctionSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/norm/LastValueFunctionSuite.scala
index 201faba6e..6143adf40 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/norm/LastValueFunctionSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/norm/LastValueFunctionSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/norm/NormalizeValueFunctionSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/norm/NormalizeValueFunctionSuite.scala
index 5364ca3e4..556c6fdda 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/norm/NormalizeValueFunctionSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/norm/NormalizeValueFunctionSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/norm/RateValueFunctionSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/norm/RateValueFunctionSuite.scala
index 8a224d671..98f272cdc 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/norm/RateValueFunctionSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/norm/RateValueFunctionSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/BaseExamplesSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/BaseExamplesSuite.scala
index 0b2eb3947..f179f10d2 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/BaseExamplesSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/BaseExamplesSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/BaseWordSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/BaseWordSuite.scala
index 715acb773..8fd840640 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/BaseWordSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/BaseWordSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/CallSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/CallSuite.scala
index ee95b30b4..79ade2f0d 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/CallSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/CallSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/ClearSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/ClearSuite.scala
index ea4bd47cc..50cc2c5d9 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/ClearSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/ClearSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/DropSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/DropSuite.scala
index f27f6d675..a5e564b61 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/DropSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/DropSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/DupSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/DupSuite.scala
index aee2f0124..24b6ecceb 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/DupSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/DupSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/EachSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/EachSuite.scala
index 6e4940cae..d270f3e71 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/EachSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/EachSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/FormatSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/FormatSuite.scala
index 4bf87c061..e66c40364 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/FormatSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/FormatSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/GetSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/GetSuite.scala
index b2ef4957e..25e7ddac0 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/GetSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/GetSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/InterpreterSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/InterpreterSuite.scala
index 946686acc..f9748f9a5 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/InterpreterSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/InterpreterSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/MapSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/MapSuite.scala
index 26e586a31..dfd18ada9 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/MapSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/MapSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/OverSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/OverSuite.scala
index 732d8e828..614ac4d3e 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/OverSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/OverSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/ReverseRotSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/ReverseRotSuite.scala
index 1bc9d31ef..fd4e793b4 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/ReverseRotSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/ReverseRotSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/RotSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/RotSuite.scala
index d4cc98a9b..d3e92cf70 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/RotSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/RotSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/SetSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/SetSuite.scala
index 65bcad6f6..55252e487 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/SetSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/SetSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/StandardExamplesSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/StandardExamplesSuite.scala
index c819309d7..35b6860bf 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/StandardExamplesSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/StandardExamplesSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/SwapSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/SwapSuite.scala
index f248e4880..733cc1197 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/SwapSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/SwapSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/VocabularySuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/VocabularySuite.scala
index b3bce693a..69c7a74fd 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/VocabularySuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/stacklang/VocabularySuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/util/Assert.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/util/Assert.scala
index 0658b2d21..ec9508b83 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/util/Assert.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/util/Assert.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/util/HashSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/util/HashSuite.scala
index 5e4dc56ee..58dc8043c 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/util/HashSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/util/HashSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/util/InternMapSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/util/InternMapSuite.scala
index c5278d0d7..3c6b029fe 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/util/InternMapSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/util/InternMapSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/util/InternerSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/util/InternerSuite.scala
index f44a5bcf4..c1060f424 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/util/InternerSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/util/InternerSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/util/MathSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/util/MathSuite.scala
index 3eeedc17e..423bfc9ae 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/util/MathSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/util/MathSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/util/PngImageSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/util/PngImageSuite.scala
index 24e2742d3..579a9f15f 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/util/PngImageSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/util/PngImageSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/util/SmallHashMapSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/util/SmallHashMapSuite.scala
index cd87da0b3..08971fd04 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/util/SmallHashMapSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/util/SmallHashMapSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/util/StringMatcherSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/util/StringMatcherSuite.scala
index 0b249be02..bcf3f7e68 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/util/StringMatcherSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/util/StringMatcherSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/util/StringsSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/util/StringsSuite.scala
index 1c85c2f79..b7ec8afc2 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/util/StringsSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/util/StringsSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/validation/HasKeyRuleSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/validation/HasKeyRuleSuite.scala
index 1a3fb94b6..06a1c2c99 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/validation/HasKeyRuleSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/validation/HasKeyRuleSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/validation/KeyLengthRuleSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/validation/KeyLengthRuleSuite.scala
index 50f1b3268..4cf4fbc63 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/validation/KeyLengthRuleSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/validation/KeyLengthRuleSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/validation/KeyPatternRuleSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/validation/KeyPatternRuleSuite.scala
index a6f58b7e5..f8a828303 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/validation/KeyPatternRuleSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/validation/KeyPatternRuleSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/validation/MaxUserTagsRuleSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/validation/MaxUserTagsRuleSuite.scala
index a83c5988b..3951bf42d 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/validation/MaxUserTagsRuleSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/validation/MaxUserTagsRuleSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/validation/NonStandardKeyRuleSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/validation/NonStandardKeyRuleSuite.scala
index 150ba7824..a4cca2225 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/validation/NonStandardKeyRuleSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/validation/NonStandardKeyRuleSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/validation/RuleSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/validation/RuleSuite.scala
index a12c5a0e8..a3d1c4753 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/validation/RuleSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/validation/RuleSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/validation/ValidCharactersRuleSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/validation/ValidCharactersRuleSuite.scala
index ca3f3a584..da1eef8f7 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/validation/ValidCharactersRuleSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/validation/ValidCharactersRuleSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/validation/ValueLengthRuleSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/validation/ValueLengthRuleSuite.scala
index c78ae2c38..399a96bae 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/validation/ValueLengthRuleSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/validation/ValueLengthRuleSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-core/src/test/scala/com/netflix/atlas/core/validation/ValuePatternRuleSuite.scala b/atlas-core/src/test/scala/com/netflix/atlas/core/validation/ValuePatternRuleSuite.scala
index 548356451..0d77446a4 100644
--- a/atlas-core/src/test/scala/com/netflix/atlas/core/validation/ValuePatternRuleSuite.scala
+++ b/atlas-core/src/test/scala/com/netflix/atlas/core/validation/ValuePatternRuleSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-jmh/src/main/scala/com/netflix/atlas/core/util/MathMax.scala b/atlas-jmh/src/main/scala/com/netflix/atlas/core/util/MathMax.scala
index f61a4e5b6..e413acb2c 100644
--- a/atlas-jmh/src/main/scala/com/netflix/atlas/core/util/MathMax.scala
+++ b/atlas-jmh/src/main/scala/com/netflix/atlas/core/util/MathMax.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-jmh/src/main/scala/com/netflix/atlas/core/util/StringMatching.scala b/atlas-jmh/src/main/scala/com/netflix/atlas/core/util/StringMatching.scala
index 309a1b79b..735ec5371 100644
--- a/atlas-jmh/src/main/scala/com/netflix/atlas/core/util/StringMatching.scala
+++ b/atlas-jmh/src/main/scala/com/netflix/atlas/core/util/StringMatching.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-json/src/main/scala/com/netflix/atlas/json/Json.scala b/atlas-json/src/main/scala/com/netflix/atlas/json/Json.scala
index 0bc8c084e..4826b664a 100644
--- a/atlas-json/src/main/scala/com/netflix/atlas/json/Json.scala
+++ b/atlas-json/src/main/scala/com/netflix/atlas/json/Json.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-json/src/main/scala/com/netflix/atlas/json/JsonParserHelper.scala b/atlas-json/src/main/scala/com/netflix/atlas/json/JsonParserHelper.scala
index a13980cb6..9bcbc982b 100644
--- a/atlas-json/src/main/scala/com/netflix/atlas/json/JsonParserHelper.scala
+++ b/atlas-json/src/main/scala/com/netflix/atlas/json/JsonParserHelper.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-json/src/main/scala/com/netflix/atlas/json/JsonSupport.scala b/atlas-json/src/main/scala/com/netflix/atlas/json/JsonSupport.scala
index 5a271e1b5..5a343acf7 100644
--- a/atlas-json/src/main/scala/com/netflix/atlas/json/JsonSupport.scala
+++ b/atlas-json/src/main/scala/com/netflix/atlas/json/JsonSupport.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-json/src/test/scala/com/netflix/atlas/json/JsonSuite.scala b/atlas-json/src/test/scala/com/netflix/atlas/json/JsonSuite.scala
index 309ac1db8..8bece9d07 100644
--- a/atlas-json/src/test/scala/com/netflix/atlas/json/JsonSuite.scala
+++ b/atlas-json/src/test/scala/com/netflix/atlas/json/JsonSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-standalone/src/main/scala/com/netflix/atlas/standalone/Main.scala b/atlas-standalone/src/main/scala/com/netflix/atlas/standalone/Main.scala
index 6d32827eb..780f855e3 100644
--- a/atlas-standalone/src/main/scala/com/netflix/atlas/standalone/Main.scala
+++ b/atlas-standalone/src/main/scala/com/netflix/atlas/standalone/Main.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-test/src/main/scala/com/netflix/atlas/test/GraphAssertions.scala b/atlas-test/src/main/scala/com/netflix/atlas/test/GraphAssertions.scala
index 77f3a3fa3..3692bba6a 100644
--- a/atlas-test/src/main/scala/com/netflix/atlas/test/GraphAssertions.scala
+++ b/atlas-test/src/main/scala/com/netflix/atlas/test/GraphAssertions.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/ApiSettings.scala b/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/ApiSettings.scala
index 720ffcd95..cbce41a2a 100644
--- a/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/ApiSettings.scala
+++ b/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/ApiSettings.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/GraphApi.scala b/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/GraphApi.scala
index 0eace4090..d51cb3f88 100644
--- a/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/GraphApi.scala
+++ b/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/GraphApi.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/GraphRequestActor.scala b/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/GraphRequestActor.scala
index e09c4293e..18e4fc4e2 100644
--- a/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/GraphRequestActor.scala
+++ b/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/GraphRequestActor.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/LocalDatabaseActor.scala b/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/LocalDatabaseActor.scala
index d06c34aa9..ad6e9a994 100644
--- a/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/LocalDatabaseActor.scala
+++ b/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/LocalDatabaseActor.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/LocalPublishActor.scala b/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/LocalPublishActor.scala
index edb2c1473..b79362974 100644
--- a/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/LocalPublishActor.scala
+++ b/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/LocalPublishActor.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/PublishApi.scala b/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/PublishApi.scala
index bef66e10f..11d25a69a 100644
--- a/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/PublishApi.scala
+++ b/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/PublishApi.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/RequestId.scala b/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/RequestId.scala
index 55c550876..d7db8f5fa 100644
--- a/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/RequestId.scala
+++ b/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/RequestId.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/TagsApi.scala b/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/TagsApi.scala
index d7c15a410..b84e1fa42 100644
--- a/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/TagsApi.scala
+++ b/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/TagsApi.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/TagsRequestActor.scala b/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/TagsRequestActor.scala
index 3d1d51f47..169596b38 100644
--- a/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/TagsRequestActor.scala
+++ b/atlas-webapi/src/main/scala/com/netflix/atlas/webapi/TagsRequestActor.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/ApiSettingsSuite.scala b/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/ApiSettingsSuite.scala
index 2c17d5156..273b80107 100644
--- a/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/ApiSettingsSuite.scala
+++ b/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/ApiSettingsSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/GraphApiSuite.scala b/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/GraphApiSuite.scala
index ec7928cc9..f383c1250 100644
--- a/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/GraphApiSuite.scala
+++ b/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/GraphApiSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/PublishApiJsonSuite.scala b/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/PublishApiJsonSuite.scala
index bf64b1264..cadfbae84 100644
--- a/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/PublishApiJsonSuite.scala
+++ b/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/PublishApiJsonSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/PublishApiSuite.scala b/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/PublishApiSuite.scala
index 9dbf732e5..3cd1f2966 100644
--- a/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/PublishApiSuite.scala
+++ b/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/PublishApiSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/RequestIdSuite.scala b/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/RequestIdSuite.scala
index 5e6cbe3ca..1b08fbb75 100644
--- a/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/RequestIdSuite.scala
+++ b/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/RequestIdSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/TagsApiSuite.scala b/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/TagsApiSuite.scala
index 514dd7774..963f57ce1 100644
--- a/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/TagsApiSuite.scala
+++ b/atlas-webapi/src/test/scala/com/netflix/atlas/webapi/TagsApiSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-wiki/src/main/scala/com/netflix/atlas/wiki/GraphHelper.scala b/atlas-wiki/src/main/scala/com/netflix/atlas/wiki/GraphHelper.scala
index 04e9aef66..e1ac6919f 100644
--- a/atlas-wiki/src/main/scala/com/netflix/atlas/wiki/GraphHelper.scala
+++ b/atlas-wiki/src/main/scala/com/netflix/atlas/wiki/GraphHelper.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/atlas-wiki/src/main/scala/com/netflix/atlas/wiki/Main.scala b/atlas-wiki/src/main/scala/com/netflix/atlas/wiki/Main.scala
index 7796a5a9d..a3936c504 100644
--- a/atlas-wiki/src/main/scala/com/netflix/atlas/wiki/Main.scala
+++ b/atlas-wiki/src/main/scala/com/netflix/atlas/wiki/Main.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/project/Bintray.scala b/project/Bintray.scala
index c1915ee6d..90e1499ce 100644
--- a/project/Bintray.scala
+++ b/project/Bintray.scala
@@ -20,7 +20,7 @@ object Bintray {
 
   lazy val settings: Seq[Def.Setting[_]] = bintraySettings ++ Seq(
     bintrayRepository := "maven",
-    bintrayPackage := "atlas",
+    bintrayPackage := "atlas_v1",
     bintrayOrganization := Some("netflixoss"),
     bintrayReleaseOnPublish := false,
     licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.txt")),
diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
index 0bae7fb7f..4fe754432 100644
--- a/project/BuildSettings.scala
+++ b/project/BuildSettings.scala
@@ -2,7 +2,7 @@ import sbt._
 import sbt.Keys._
 
 object BuildSettings {
-  val organization = "com.netflix.atlas"
+  val organization = "com.netflix.atlas_v1"
 
   val compilerFlags = Seq(
     "-deprecation",