diff --git a/LICENSE b/LICENSE
index 3625093..7c49282 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright 2015-2016 PointSource, LLC.
+Copyright (c) 2015-2016 PointSource, LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/auth/google-jwt.js b/auth/google-jwt.js
index b6f70a6..fdb8a0f 100644
--- a/auth/google-jwt.js
+++ b/auth/google-jwt.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 
diff --git a/auth/google-oauth.js b/auth/google-oauth.js
index 0378129..c579691 100644
--- a/auth/google-oauth.js
+++ b/auth/google-oauth.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 /*
diff --git a/bin/blueoak-server.js b/bin/blueoak-server.js
index 1d4714b..df82f2a 100755
--- a/bin/blueoak-server.js
+++ b/bin/blueoak-server.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var server = require('../');
diff --git a/bin/decrypt.js b/bin/decrypt.js
index e4d95aa..52b794e 100755
--- a/bin/decrypt.js
+++ b/bin/decrypt.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 
diff --git a/bin/encrypt.js b/bin/encrypt.js
index bcbc0dc..d164054 100755
--- a/bin/encrypt.js
+++ b/bin/encrypt.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 
diff --git a/examples/custom-auth/auth/get-age.js b/examples/custom-auth/auth/get-age.js
index 9f5ac92..6411a7a 100644
--- a/examples/custom-auth/auth/get-age.js
+++ b/examples/custom-auth/auth/get-age.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.init = function (app) {
diff --git a/examples/custom-auth/auth/my-custom-auth.js b/examples/custom-auth/auth/my-custom-auth.js
index 0d0ae07..5fadfa0 100644
--- a/examples/custom-auth/auth/my-custom-auth.js
+++ b/examples/custom-auth/auth/my-custom-auth.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 /**
diff --git a/examples/custom-auth/handlers/test.js b/examples/custom-auth/handlers/test.js
index 0705692..5dd11f2 100644
--- a/examples/custom-auth/handlers/test.js
+++ b/examples/custom-auth/handlers/test.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 
diff --git a/examples/custom-auth/index.js b/examples/custom-auth/index.js
index f0c7452..ec964d4 100644
--- a/examples/custom-auth/index.js
+++ b/examples/custom-auth/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var server = require('blueoak-server');
diff --git a/examples/custom-logging/index.js b/examples/custom-logging/index.js
index f0c7452..ec964d4 100644
--- a/examples/custom-logging/index.js
+++ b/examples/custom-logging/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var server = require('blueoak-server');
diff --git a/examples/custom-logging/logger.js b/examples/custom-logging/logger.js
index 66c1170..a118f3b 100644
--- a/examples/custom-logging/logger.js
+++ b/examples/custom-logging/logger.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //Placing a logger.js in my app root let's me setup a logger via code rather than config.
diff --git a/examples/ext-modules/index.js b/examples/ext-modules/index.js
index f0c7452..ec964d4 100644
--- a/examples/ext-modules/index.js
+++ b/examples/ext-modules/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var server = require('blueoak-server');
diff --git a/examples/fileupload/handlers/upload.js b/examples/fileupload/handlers/upload.js
index 92ec2b2..6b59b7f 100644
--- a/examples/fileupload/handlers/upload.js
+++ b/examples/fileupload/handlers/upload.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 
diff --git a/examples/fileupload/index.js b/examples/fileupload/index.js
index f0c7452..ec964d4 100644
--- a/examples/fileupload/index.js
+++ b/examples/fileupload/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var server = require('blueoak-server');
diff --git a/examples/google-auth/handlers/test.js b/examples/google-auth/handlers/test.js
index dc0c9fc..c0668ec 100644
--- a/examples/google-auth/handlers/test.js
+++ b/examples/google-auth/handlers/test.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 
diff --git a/examples/google-auth/handlers/test2.js b/examples/google-auth/handlers/test2.js
index 7725299..78eeb46 100644
--- a/examples/google-auth/handlers/test2.js
+++ b/examples/google-auth/handlers/test2.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.init = function(app, auth) {
diff --git a/examples/google-auth/index.js b/examples/google-auth/index.js
index 25c3f4c..dab7fdc 100644
--- a/examples/google-auth/index.js
+++ b/examples/google-auth/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var server = require('../../');
diff --git a/examples/helloworld/handlers/foo.js b/examples/helloworld/handlers/foo.js
index 1be084e..61f6c70 100644
--- a/examples/helloworld/handlers/foo.js
+++ b/examples/helloworld/handlers/foo.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 
diff --git a/examples/helloworld/handlers/hello.js b/examples/helloworld/handlers/hello.js
index 18e0c7a..5cbe199 100644
--- a/examples/helloworld/handlers/hello.js
+++ b/examples/helloworld/handlers/hello.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 
diff --git a/examples/helloworld/index.js b/examples/helloworld/index.js
index 923aa96..684e64e 100644
--- a/examples/helloworld/index.js
+++ b/examples/helloworld/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var server = require('blueoak-server');
diff --git a/examples/helloworld/middleware/errors.js b/examples/helloworld/middleware/errors.js
index 5ca8d50..637214d 100644
--- a/examples/helloworld/middleware/errors.js
+++ b/examples/helloworld/middleware/errors.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.init = function(app, logger) {
diff --git a/examples/helloworld/services/randomizer.js b/examples/helloworld/services/randomizer.js
index 50dab53..fcab55f 100644
--- a/examples/helloworld/services/randomizer.js
+++ b/examples/helloworld/services/randomizer.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //Uses random.org to generate a random integer
diff --git a/examples/packages/echo-service/index.js b/examples/packages/echo-service/index.js
index 78e7022..adf32f9 100644
--- a/examples/packages/echo-service/index.js
+++ b/examples/packages/echo-service/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.init = function() {
diff --git a/examples/packages/my-handler/index.js b/examples/packages/my-handler/index.js
index 56b96f5..0e8dd04 100644
--- a/examples/packages/my-handler/index.js
+++ b/examples/packages/my-handler/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 module.exports.init = function (app, logger, echoService) {
diff --git a/examples/redis/handlers/main.js b/examples/redis/handlers/main.js
index cbe33ee..ffc0eef 100644
--- a/examples/redis/handlers/main.js
+++ b/examples/redis/handlers/main.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.init = function (app, cache, logger) {
diff --git a/examples/redis/index.js b/examples/redis/index.js
index 923aa96..684e64e 100644
--- a/examples/redis/index.js
+++ b/examples/redis/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var server = require('blueoak-server');
diff --git a/examples/ssl/handlers/secure.js b/examples/ssl/handlers/secure.js
index 1d3188a..1b9b40a 100644
--- a/examples/ssl/handlers/secure.js
+++ b/examples/ssl/handlers/secure.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 module.exports.init = function(app) {
diff --git a/examples/ssl/index.js b/examples/ssl/index.js
index f0c7452..ec964d4 100644
--- a/examples/ssl/index.js
+++ b/examples/ssl/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var server = require('blueoak-server');
diff --git a/examples/swagger/handlers/petstore.js b/examples/swagger/handlers/petstore.js
index 92c78ca..ce09429 100644
--- a/examples/swagger/handlers/petstore.js
+++ b/examples/swagger/handlers/petstore.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 
diff --git a/examples/swagger/index.js b/examples/swagger/index.js
index f0c7452..ec964d4 100644
--- a/examples/swagger/index.js
+++ b/examples/swagger/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var server = require('blueoak-server');
diff --git a/examples/swagger/middleware/errors.js b/examples/swagger/middleware/errors.js
index 1a3f264..5d8c1be 100644
--- a/examples/swagger/middleware/errors.js
+++ b/examples/swagger/middleware/errors.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.init = function(app, logger) {
diff --git a/handlers/_routes.js b/handlers/_routes.js
index 2238a0b..18865a0 100644
--- a/handlers/_routes.js
+++ b/handlers/_routes.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var _ = require('lodash');
diff --git a/handlers/_swagger.js b/handlers/_swagger.js
index eac6d7b..3999fac 100644
--- a/handlers/_swagger.js
+++ b/handlers/_swagger.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var _ = require('lodash'),
diff --git a/index.js b/index.js
index 5864940..6ee2bcd 100644
--- a/index.js
+++ b/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var path = require('path'),
diff --git a/lib/dependencyCalc.js b/lib/dependencyCalc.js
index 6a946b7..ce8e932 100644
--- a/lib/dependencyCalc.js
+++ b/lib/dependencyCalc.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 /*
diff --git a/lib/di.js b/lib/di.js
index 0f9a9ff..41ba17c 100644
--- a/lib/di.js
+++ b/lib/di.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //Dependency injection utils
diff --git a/lib/loader.js b/lib/loader.js
index 82921ad..5c6d70d 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 'use strict';
diff --git a/lib/nodeCacheInterface.js b/lib/nodeCacheInterface.js
index 39d6c2e..18226eb 100644
--- a/lib/nodeCacheInterface.js
+++ b/lib/nodeCacheInterface.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //This is a cache interface for the in-memory node cache.
diff --git a/lib/project.js b/lib/project.js
index 6417a35..74c0365 100644
--- a/lib/project.js
+++ b/lib/project.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var path = require('path');
diff --git a/lib/security.js b/lib/security.js
index bb63a0b..64119a5 100644
--- a/lib/security.js
+++ b/lib/security.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var crypto = require('crypto'),
diff --git a/lib/subRequire.js b/lib/subRequire.js
index e1fd814..e2e2352 100644
--- a/lib/subRequire.js
+++ b/lib/subRequire.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 /* This provides some extended 'require' functionality needed for the loader
diff --git a/lib/swaggerUtil.js b/lib/swaggerUtil.js
index 2235fc8..fb48ed2 100644
--- a/lib/swaggerUtil.js
+++ b/lib/swaggerUtil.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var tv4 = require('tv4'),
diff --git a/middleware/_errors.js b/middleware/_errors.js
index 665f98b..58140a3 100644
--- a/middleware/_errors.js
+++ b/middleware/_errors.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.init = function (app, logger) {
diff --git a/middleware/bodyParser.js b/middleware/bodyParser.js
index 3ae8373..260de61 100644
--- a/middleware/bodyParser.js
+++ b/middleware/bodyParser.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 /**
diff --git a/middleware/cors.js b/middleware/cors.js
index 1b0279a..bdd583b 100644
--- a/middleware/cors.js
+++ b/middleware/cors.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 /*
diff --git a/middleware/csrf.js b/middleware/csrf.js
index 0cf2144..5b9b9a6 100644
--- a/middleware/csrf.js
+++ b/middleware/csrf.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var whitelist = [];
diff --git a/middleware/express-monitor.js b/middleware/express-monitor.js
index 8240e01..d22b6ee 100644
--- a/middleware/express-monitor.js
+++ b/middleware/express-monitor.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.init = function(app, config, logger, monitor) {
diff --git a/middleware/express-static.js b/middleware/express-static.js
index f881e4d..0266b7f 100644
--- a/middleware/express-static.js
+++ b/middleware/express-static.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 /*
diff --git a/middleware/session.js b/middleware/session.js
index 04eeb39..1260e12 100644
--- a/middleware/session.js
+++ b/middleware/session.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 /*
diff --git a/services/auth.js b/services/auth.js
index 7932a53..b111403 100644
--- a/services/auth.js
+++ b/services/auth.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 /*
diff --git a/services/cache.js b/services/cache.js
index 9e01123..ec74d4d 100644
--- a/services/cache.js
+++ b/services/cache.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //Provides a cache service that can support multiple underlying interfaces
diff --git a/services/config.js b/services/config.js
index 26eba95..3ecfb34 100644
--- a/services/config.js
+++ b/services/config.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var stripJsonComments = require('strip-json-comments'),
diff --git a/services/express.js b/services/express.js
index 04b5b8d..d110545 100644
--- a/services/express.js
+++ b/services/express.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 /*
diff --git a/services/logger.js b/services/logger.js
index f6c9435..16c5c5b 100644
--- a/services/logger.js
+++ b/services/logger.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var _ = require('lodash'),
diff --git a/services/middleware.js b/services/middleware.js
index 87c18b6..bae9f76 100644
--- a/services/middleware.js
+++ b/services/middleware.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 /*
diff --git a/services/monitor.js b/services/monitor.js
index f760ac6..ca9f164 100644
--- a/services/monitor.js
+++ b/services/monitor.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var StatsD = require('node-statsd'),
diff --git a/services/postMiddleware.js b/services/postMiddleware.js
index 94d5bcb..f6b88b1 100644
--- a/services/postMiddleware.js
+++ b/services/postMiddleware.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 /*
diff --git a/services/redis.js b/services/redis.js
index 3ffb482..1af37aa 100644
--- a/services/redis.js
+++ b/services/redis.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var redis = require('redis');
diff --git a/services/stats.js b/services/stats.js
index 25bcfa4..a320255 100644
--- a/services/stats.js
+++ b/services/stats.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var async = require('async');
diff --git a/services/system.js b/services/system.js
index c7b48a9..695593b 100644
--- a/services/system.js
+++ b/services/system.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var os = require('os');
diff --git a/test/integration/fixtures/server1/handlers/handler1.js b/test/integration/fixtures/server1/handlers/handler1.js
index cd5bd74..28f0bd3 100644
--- a/test/integration/fixtures/server1/handlers/handler1.js
+++ b/test/integration/fixtures/server1/handlers/handler1.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 
diff --git a/test/integration/fixtures/server2/handlers/camelCase.js b/test/integration/fixtures/server2/handlers/camelCase.js
index 97d53cf..19ba72b 100644
--- a/test/integration/fixtures/server2/handlers/camelCase.js
+++ b/test/integration/fixtures/server2/handlers/camelCase.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 
diff --git a/test/integration/fixtures/server2/handlers/handler2.js b/test/integration/fixtures/server2/handlers/handler2.js
index d3c3341..b78b5c4 100644
--- a/test/integration/fixtures/server2/handlers/handler2.js
+++ b/test/integration/fixtures/server2/handlers/handler2.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 
diff --git a/test/integration/fixtures/server3/handlers/handler.js b/test/integration/fixtures/server3/handlers/handler.js
index 7e20edd..36a5a20 100644
--- a/test/integration/fixtures/server3/handlers/handler.js
+++ b/test/integration/fixtures/server3/handlers/handler.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 
diff --git a/test/integration/fixtures/server4/handlers/petstore.js b/test/integration/fixtures/server4/handlers/petstore.js
index 13b049e..d281f71 100644
--- a/test/integration/fixtures/server4/handlers/petstore.js
+++ b/test/integration/fixtures/server4/handlers/petstore.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.findPets = function(req, res, next) {
diff --git a/test/integration/fixtures/server4/handlers/petstore2.js b/test/integration/fixtures/server4/handlers/petstore2.js
index b32b74a..5cf1a53 100644
--- a/test/integration/fixtures/server4/handlers/petstore2.js
+++ b/test/integration/fixtures/server4/handlers/petstore2.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 module.exports.findPets = function(req, res, next) {
diff --git a/test/integration/fixtures/server4/handlers/petstore3.js b/test/integration/fixtures/server4/handlers/petstore3.js
index 8bcf471..606039a 100644
--- a/test/integration/fixtures/server4/handlers/petstore3.js
+++ b/test/integration/fixtures/server4/handlers/petstore3.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 module.exports = {
diff --git a/test/integration/fixtures/server5/handlers/foo.js b/test/integration/fixtures/server5/handlers/foo.js
index 5160e4e..f7d75d8 100644
--- a/test/integration/fixtures/server5/handlers/foo.js
+++ b/test/integration/fixtures/server5/handlers/foo.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.pets5 = function(req, res, next) {
diff --git a/test/integration/fixtures/server5/handlers/petstore.js b/test/integration/fixtures/server5/handlers/petstore.js
index d82f4c5..a842f50 100644
--- a/test/integration/fixtures/server5/handlers/petstore.js
+++ b/test/integration/fixtures/server5/handlers/petstore.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.pets1 = function(req, res, next) {
diff --git a/test/integration/fixtures/server6/services/logger.js b/test/integration/fixtures/server6/services/logger.js
index caf708f..fb412ce 100644
--- a/test/integration/fixtures/server6/services/logger.js
+++ b/test/integration/fixtures/server6/services/logger.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.init = function() {
diff --git a/test/integration/fixtures/server7/handlers/index.js b/test/integration/fixtures/server7/handlers/index.js
index 7fb43fc..aae50b9 100644
--- a/test/integration/fixtures/server7/handlers/index.js
+++ b/test/integration/fixtures/server7/handlers/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.foo = function(req, res, next) {
diff --git a/test/integration/fixtures/server7/handlers/petstore.js b/test/integration/fixtures/server7/handlers/petstore.js
index 2afb15d..bef61ea 100644
--- a/test/integration/fixtures/server7/handlers/petstore.js
+++ b/test/integration/fixtures/server7/handlers/petstore.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.getPetById = function(req, res, next) {
diff --git a/test/integration/launchUtil.js b/test/integration/launchUtil.js
index 14c6c33..551f8c7 100644
--- a/test/integration/launchUtil.js
+++ b/test/integration/launchUtil.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var path = require('path'),
diff --git a/test/integration/testDeclarativeRoutes.js b/test/integration/testDeclarativeRoutes.js
index b850ca0..fdcb5f6 100644
--- a/test/integration/testDeclarativeRoutes.js
+++ b/test/integration/testDeclarativeRoutes.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var request = require('request'),
diff --git a/test/integration/testHandlers.js b/test/integration/testHandlers.js
index 60dc5bd..c6108fc 100644
--- a/test/integration/testHandlers.js
+++ b/test/integration/testHandlers.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var request = require('request'),
diff --git a/test/integration/testLoader.js b/test/integration/testLoader.js
index cd400a6..697bfc1 100644
--- a/test/integration/testLoader.js
+++ b/test/integration/testLoader.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var assert = require('assert'),
diff --git a/test/integration/testSession.js b/test/integration/testSession.js
index f8dffd4..adbe949 100644
--- a/test/integration/testSession.js
+++ b/test/integration/testSession.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var request = require('request').defaults({jar: true}); //need cookies enabled since this is cookie session
diff --git a/test/integration/testSwagger.js b/test/integration/testSwagger.js
index 7282cdd..daec7c6 100644
--- a/test/integration/testSwagger.js
+++ b/test/integration/testSwagger.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var request = require('request'),
diff --git a/test/unit/fixtures/loader/test1/service1.js b/test/unit/fixtures/loader/test1/service1.js
index 9ac4c75..c3c0f99 100644
--- a/test/unit/fixtures/loader/test1/service1.js
+++ b/test/unit/fixtures/loader/test1/service1.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //uses sync init to set initialized to true
diff --git a/test/unit/fixtures/loader/test1/service2.js b/test/unit/fixtures/loader/test1/service2.js
index 45f1241..24fca61 100644
--- a/test/unit/fixtures/loader/test1/service2.js
+++ b/test/unit/fixtures/loader/test1/service2.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //uses async init to set initialized to true
diff --git a/test/unit/fixtures/loader/test10/service18.js b/test/unit/fixtures/loader/test10/service18.js
index 8c132c0..deb06f8 100644
--- a/test/unit/fixtures/loader/test10/service18.js
+++ b/test/unit/fixtures/loader/test10/service18.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var initialized = false;
diff --git a/test/unit/fixtures/loader/test10/service19.js b/test/unit/fixtures/loader/test10/service19.js
index 8c132c0..deb06f8 100644
--- a/test/unit/fixtures/loader/test10/service19.js
+++ b/test/unit/fixtures/loader/test10/service19.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var initialized = false;
diff --git a/test/unit/fixtures/loader/test11/consumers/dir1/consumer5.js b/test/unit/fixtures/loader/test11/consumers/dir1/consumer5.js
index 4af930b..876cec2 100644
--- a/test/unit/fixtures/loader/test11/consumers/dir1/consumer5.js
+++ b/test/unit/fixtures/loader/test11/consumers/dir1/consumer5.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.init = function(service21) {
diff --git a/test/unit/fixtures/loader/test11/services/dir2/dir3/service22.js b/test/unit/fixtures/loader/test11/services/dir2/dir3/service22.js
index edba454..fc7c7f2 100644
--- a/test/unit/fixtures/loader/test11/services/dir2/dir3/service22.js
+++ b/test/unit/fixtures/loader/test11/services/dir2/dir3/service22.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var initialized = false;
diff --git a/test/unit/fixtures/loader/test11/services/dir2/service21.js b/test/unit/fixtures/loader/test11/services/dir2/service21.js
index c9a0fc2..3647822 100644
--- a/test/unit/fixtures/loader/test11/services/dir2/service21.js
+++ b/test/unit/fixtures/loader/test11/services/dir2/service21.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var initialized = false;
diff --git a/test/unit/fixtures/loader/test2/service3.js b/test/unit/fixtures/loader/test2/service3.js
index 74f8fee..b6023f1 100644
--- a/test/unit/fixtures/loader/test2/service3.js
+++ b/test/unit/fixtures/loader/test2/service3.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //asynchronous
diff --git a/test/unit/fixtures/loader/test2/service4.js b/test/unit/fixtures/loader/test2/service4.js
index 3fe3b19..56c4d06 100644
--- a/test/unit/fixtures/loader/test2/service4.js
+++ b/test/unit/fixtures/loader/test2/service4.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //synchronous
diff --git a/test/unit/fixtures/loader/test3/service5.js b/test/unit/fixtures/loader/test3/service5.js
index 45f1241..24fca61 100644
--- a/test/unit/fixtures/loader/test3/service5.js
+++ b/test/unit/fixtures/loader/test3/service5.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //uses async init to set initialized to true
diff --git a/test/unit/fixtures/loader/test3/service6.js b/test/unit/fixtures/loader/test3/service6.js
index 5bcd124..2490492 100644
--- a/test/unit/fixtures/loader/test3/service6.js
+++ b/test/unit/fixtures/loader/test3/service6.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //uses async init to set initialized to true
diff --git a/test/unit/fixtures/loader/test3/service7.js b/test/unit/fixtures/loader/test3/service7.js
index 49b8342..258aa1e 100644
--- a/test/unit/fixtures/loader/test3/service7.js
+++ b/test/unit/fixtures/loader/test3/service7.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //uses async init to set initialized to true
diff --git a/test/unit/fixtures/loader/test4/service8.js b/test/unit/fixtures/loader/test4/service8.js
index ff29cc7..0778f35 100644
--- a/test/unit/fixtures/loader/test4/service8.js
+++ b/test/unit/fixtures/loader/test4/service8.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //uses async init to set initialized to true
diff --git a/test/unit/fixtures/loader/test4/service9.js b/test/unit/fixtures/loader/test4/service9.js
index 45f1241..24fca61 100644
--- a/test/unit/fixtures/loader/test4/service9.js
+++ b/test/unit/fixtures/loader/test4/service9.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //uses async init to set initialized to true
diff --git a/test/unit/fixtures/loader/test5/service10.js b/test/unit/fixtures/loader/test5/service10.js
index 0f525cf..f7dc99b 100644
--- a/test/unit/fixtures/loader/test5/service10.js
+++ b/test/unit/fixtures/loader/test5/service10.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //uses async init to set initialized to true
diff --git a/test/unit/fixtures/loader/test5/service11.js b/test/unit/fixtures/loader/test5/service11.js
index cdee016..6993610 100644
--- a/test/unit/fixtures/loader/test5/service11.js
+++ b/test/unit/fixtures/loader/test5/service11.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //uses async init to set initialized to true
diff --git a/test/unit/fixtures/loader/test6/badConsumers/consumer1.js b/test/unit/fixtures/loader/test6/badConsumers/consumer1.js
index 4a43c51..b7fb98d 100644
--- a/test/unit/fixtures/loader/test6/badConsumers/consumer1.js
+++ b/test/unit/fixtures/loader/test6/badConsumers/consumer1.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.init = function(service20, callback) {
diff --git a/test/unit/fixtures/loader/test6/badConsumers/consumer2.js b/test/unit/fixtures/loader/test6/badConsumers/consumer2.js
index 5c7f000..5d42cf6 100644
--- a/test/unit/fixtures/loader/test6/badConsumers/consumer2.js
+++ b/test/unit/fixtures/loader/test6/badConsumers/consumer2.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.init = function(service20) {
diff --git a/test/unit/fixtures/loader/test6/consumers/consumer1.js b/test/unit/fixtures/loader/test6/consumers/consumer1.js
index 76f501e..1c35a37 100644
--- a/test/unit/fixtures/loader/test6/consumers/consumer1.js
+++ b/test/unit/fixtures/loader/test6/consumers/consumer1.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.init = function(service20, callback) {
diff --git a/test/unit/fixtures/loader/test6/consumers/consumer2.js b/test/unit/fixtures/loader/test6/consumers/consumer2.js
index 36dd7c6..58ce5dc 100644
--- a/test/unit/fixtures/loader/test6/consumers/consumer2.js
+++ b/test/unit/fixtures/loader/test6/consumers/consumer2.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.init = function(service20) {
diff --git a/test/unit/fixtures/loader/test6/otherConsumers/consumer1.js b/test/unit/fixtures/loader/test6/otherConsumers/consumer1.js
index 94abe4d..8a5b33f 100644
--- a/test/unit/fixtures/loader/test6/otherConsumers/consumer1.js
+++ b/test/unit/fixtures/loader/test6/otherConsumers/consumer1.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.init = function(service20, callback) {
diff --git a/test/unit/fixtures/loader/test6/services/service20.js b/test/unit/fixtures/loader/test6/services/service20.js
index 8ac1d62..6926a18 100644
--- a/test/unit/fixtures/loader/test6/services/service20.js
+++ b/test/unit/fixtures/loader/test6/services/service20.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //uses async init to set initialized to true
diff --git a/test/unit/fixtures/loader/test7/service12.js b/test/unit/fixtures/loader/test7/service12.js
index 9ae5c9e..73bb4f6 100644
--- a/test/unit/fixtures/loader/test7/service12.js
+++ b/test/unit/fixtures/loader/test7/service12.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //uses async init to set initialized to true
diff --git a/test/unit/fixtures/loader/test7/service13.js b/test/unit/fixtures/loader/test7/service13.js
index a4c94e7..e7948a2 100644
--- a/test/unit/fixtures/loader/test7/service13.js
+++ b/test/unit/fixtures/loader/test7/service13.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //uses async init to set initialized to true
diff --git a/test/unit/fixtures/loader/test7/service14.js b/test/unit/fixtures/loader/test7/service14.js
index 2c859ac..d5287c4 100644
--- a/test/unit/fixtures/loader/test7/service14.js
+++ b/test/unit/fixtures/loader/test7/service14.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //uses async init to set initialized to true
diff --git a/test/unit/fixtures/loader/test7/service15.js b/test/unit/fixtures/loader/test7/service15.js
index aa559ff..7c37020 100644
--- a/test/unit/fixtures/loader/test7/service15.js
+++ b/test/unit/fixtures/loader/test7/service15.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //uses async init to set initialized to true
diff --git a/test/unit/fixtures/loader/test8/service-one.js b/test/unit/fixtures/loader/test8/service-one.js
index 9f1d57f..ef50acc 100644
--- a/test/unit/fixtures/loader/test8/service-one.js
+++ b/test/unit/fixtures/loader/test8/service-one.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var initialized = false;
diff --git a/test/unit/fixtures/loader/test8/service15.js b/test/unit/fixtures/loader/test8/service15.js
index 2b3fa48..f908466 100644
--- a/test/unit/fixtures/loader/test8/service15.js
+++ b/test/unit/fixtures/loader/test8/service15.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var initialized = false;
diff --git a/test/unit/fixtures/logger/logger.js b/test/unit/fixtures/logger/logger.js
index 82414b3..05131df 100644
--- a/test/unit/fixtures/logger/logger.js
+++ b/test/unit/fixtures/logger/logger.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var init = false;
diff --git a/test/unit/fixtures/logger/transports/transport.js b/test/unit/fixtures/logger/transports/transport.js
index a6a761b..0f9cbd0 100644
--- a/test/unit/fixtures/logger/transports/transport.js
+++ b/test/unit/fixtures/logger/transports/transport.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 
diff --git a/test/unit/fixtures/subrequire/test1/test.js b/test/unit/fixtures/subrequire/test1/test.js
index 5226144..2aaf259 100644
--- a/test/unit/fixtures/subrequire/test1/test.js
+++ b/test/unit/fixtures/subrequire/test1/test.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.test = function() {
diff --git a/test/unit/fixtures/subrequire/test2/node_modules/test/index.js b/test/unit/fixtures/subrequire/test2/node_modules/test/index.js
index 33c7b3a..0bea3ae 100644
--- a/test/unit/fixtures/subrequire/test2/node_modules/test/index.js
+++ b/test/unit/fixtures/subrequire/test2/node_modules/test/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.test = function() {
diff --git a/test/unit/fixtures/subrequire/test3/node_modules/express/index.js b/test/unit/fixtures/subrequire/test3/node_modules/express/index.js
index f3b76dc..573f3c8 100644
--- a/test/unit/fixtures/subrequire/test3/node_modules/express/index.js
+++ b/test/unit/fixtures/subrequire/test3/node_modules/express/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.test = function() {
diff --git a/test/unit/fixtures/subrequire/test4/node_modules/test/index.js b/test/unit/fixtures/subrequire/test4/node_modules/test/index.js
index 2c0346e..c056287 100644
--- a/test/unit/fixtures/subrequire/test4/node_modules/test/index.js
+++ b/test/unit/fixtures/subrequire/test4/node_modules/test/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
  exports.test = function() {
diff --git a/test/unit/fixtures/subrequire/test4/node_modules/test/node_modules/express/index.js b/test/unit/fixtures/subrequire/test4/node_modules/test/node_modules/express/index.js
index 64266e7..69d7d42 100644
--- a/test/unit/fixtures/subrequire/test4/node_modules/test/node_modules/express/index.js
+++ b/test/unit/fixtures/subrequire/test4/node_modules/test/node_modules/express/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.test = function() {
diff --git a/test/unit/testCaching.js b/test/unit/testCaching.js
index fc08f32..f2ef5d6 100644
--- a/test/unit/testCaching.js
+++ b/test/unit/testCaching.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var assert = require('assert'),
diff --git a/test/unit/testConfig.js b/test/unit/testConfig.js
index bb32c60..e327581 100644
--- a/test/unit/testConfig.js
+++ b/test/unit/testConfig.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var assert = require('assert'),
diff --git a/test/unit/testDependencyCalc.js b/test/unit/testDependencyCalc.js
index 22fe5c6..55850f5 100644
--- a/test/unit/testDependencyCalc.js
+++ b/test/unit/testDependencyCalc.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var assert = require('assert'),
diff --git a/test/unit/testLoader.js b/test/unit/testLoader.js
index 11a2926..2045246 100644
--- a/test/unit/testLoader.js
+++ b/test/unit/testLoader.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var assert = require('assert'),
diff --git a/test/unit/testLogger.js b/test/unit/testLogger.js
index 82118dd..26a90d3 100644
--- a/test/unit/testLogger.js
+++ b/test/unit/testLogger.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var assert = require('assert'),
diff --git a/test/unit/testSecurity.js b/test/unit/testSecurity.js
index 473ce11..1f1371b 100644
--- a/test/unit/testSecurity.js
+++ b/test/unit/testSecurity.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var assert = require('assert'),
diff --git a/test/unit/testSubRequire.js b/test/unit/testSubRequire.js
index 913f101..dcdd3d6 100644
--- a/test/unit/testSubRequire.js
+++ b/test/unit/testSubRequire.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var assert = require('assert'),
diff --git a/test/unit/testSwagger.js b/test/unit/testSwagger.js
index 0d95b0a..8e19288 100644
--- a/test/unit/testSwagger.js
+++ b/test/unit/testSwagger.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var assert = require('assert'),
diff --git a/test/unit/testTestUtil.js b/test/unit/testTestUtil.js
index d5245f9..dcc8044 100644
--- a/test/unit/testTestUtil.js
+++ b/test/unit/testTestUtil.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 var assert = require('assert'),
diff --git a/testlib/mocks/config.js b/testlib/mocks/config.js
index f2d3397..ac7e3a0 100644
--- a/testlib/mocks/config.js
+++ b/testlib/mocks/config.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 exports.get = function() {
diff --git a/testlib/mocks/logger.js b/testlib/mocks/logger.js
index f198bcb..574b17e 100644
--- a/testlib/mocks/logger.js
+++ b/testlib/mocks/logger.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 ['silly', 'debug', 'verbose', 'info', 'warn', 'error'].forEach(function (name) {
diff --git a/testlib/mocks/monitor.js b/testlib/mocks/monitor.js
index 988dda7..60abedd 100644
--- a/testlib/mocks/monitor.js
+++ b/testlib/mocks/monitor.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 ['increment', 'decrement', 'set', 'unique', 'gauge', 'histogram', 'timing', 'enabled'].forEach(function (name) {
diff --git a/testlib/util.js b/testlib/util.js
index 8922332..e9b1792 100644
--- a/testlib/util.js
+++ b/testlib/util.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 PointSource, LLC.
+ * Copyright (c) 2015-2016 PointSource, LLC.
  * MIT Licensed
  */
 //Some utilities to help with testing services