diff --git a/.travis.yml b/.travis.yml
index c85fbd7..eb64aa3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,7 @@ os:
 cache:
   directories:
   - ~/.m2/repository
-env:
-- MAVEN_OPTS=-Dorg.slf4j.simpleLogger.log.org.codehaus.mojo.cobertura.CoberturaReportMojo=off
 install:
 - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Djib.skip -q -Ptravis
 script:
-- mvn test -B -Djib.skip -q cobertura:cobertura coveralls:report -Ptravis -DrepoToken=${COVERALLS_REPO_TOKEN}
+- mvn test -B -Djib.skip -q jacoco:report coveralls:report -Ptravis -DrepoToken=${COVERALLS_REPO_TOKEN}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0aa509..b75081d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [6.0.9] - TBD
+### Changed
+- Updated `hotels-oss-parent` to version 4.0.1 (was 2.3.1).
+
 ## [6.0.8] - 2019-05-13
 ### Changed
 - Weigh-bridge: Added missing `hazelcast-kubernetes` dependency.
diff --git a/README.md b/README.md
index 420d48a..cf50077 100644
--- a/README.md
+++ b/README.md
@@ -150,4 +150,4 @@ This project follows the [all-contributors](https://github.com/kentcdodds/all-co
 ## Legal
 This project is available under the [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0.html).
 
-Copyright 2019 Expedia Inc.
+Copyright 2019 Expedia, Inc.
diff --git a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/AgentProperty.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/AgentProperty.java
index cde02cb..888ed75 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/AgentProperty.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/AgentProperty.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/HiveModelReader.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/HiveModelReader.java
index 2bb88be..335f015 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/HiveModelReader.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/HiveModelReader.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/HiveStatusPatchBuilder.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/HiveStatusPatchBuilder.java
index f98c187..dec844a 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/HiveStatusPatchBuilder.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/HiveStatusPatchBuilder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/HiveTableAction.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/HiveTableAction.java
index 2eb8125..29dba93 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/HiveTableAction.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/HiveTableAction.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LanderMonitor.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LanderMonitor.java
index b7da651..aed910d 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LanderMonitor.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LanderMonitor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LanderTaskRunner.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LanderTaskRunner.java
index 0e1cec5..cdb421a 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LanderTaskRunner.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LanderTaskRunner.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LoadingBay.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LoadingBay.java
index ee7c136..a76fadb 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LoadingBay.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LoadingBay.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LoadingBayApp.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LoadingBayApp.java
index 39b4a70..5beadb0 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LoadingBayApp.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LoadingBayApp.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LoadingBayStartup.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LoadingBayStartup.java
index 037c5a7..90a764d 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LoadingBayStartup.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LoadingBayStartup.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LoadingCacheFactory.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LoadingCacheFactory.java
index 7b7bbb7..0b85df6 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LoadingCacheFactory.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/LoadingCacheFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/NoActiveSchemaException.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/NoActiveSchemaException.java
index 4476ad9..7467c1d 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/NoActiveSchemaException.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/NoActiveSchemaException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/NoDataToLandException.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/NoDataToLandException.java
index 15e349d..058e0f3 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/NoDataToLandException.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/NoDataToLandException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/OffsetManager.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/OffsetManager.java
index 9c1d215..ea07970 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/OffsetManager.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/OffsetManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/RootController.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/RootController.java
index 9ce22b2..71fa759 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/RootController.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/RootController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/event/HiveNotificationHandler.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/event/HiveNotificationHandler.java
index 7a8d06d..c1a5463 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/event/HiveNotificationHandler.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/event/HiveNotificationHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/Lander.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/Lander.java
index 6dbda9a..b3c34d5 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/Lander.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/Lander.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/LanderConfiguration.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/LanderConfiguration.java
index eada4ce..bce2241 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/LanderConfiguration.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/LanderConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/OffsetRange.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/OffsetRange.java
index 006806c..342e4a8 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/OffsetRange.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/OffsetRange.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/TruckParkConstants.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/TruckParkConstants.java
index 9b6e4fc..da87e5f 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/TruckParkConstants.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/TruckParkConstants.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/ArgsFactory.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/ArgsFactory.java
index 77701f0..74d5719 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/ArgsFactory.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/ArgsFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/ConfigMapSupplier.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/ConfigMapSupplier.java
index 52ecf4c..e025ccc 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/ConfigMapSupplier.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/ConfigMapSupplier.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/KubernetesConfiguration.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/KubernetesConfiguration.java
index beaaeed..8e73755 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/KubernetesConfiguration.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/KubernetesConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/KubernetesLander.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/KubernetesLander.java
index c5656c3..0dc69cc 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/KubernetesLander.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/KubernetesLander.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/Labels.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/Labels.java
index 4399c8e..7049b4c 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/Labels.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/Labels.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/LanderPodFactory.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/LanderPodFactory.java
index 49e1a31..fc419f0 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/LanderPodFactory.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/LanderPodFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/ParallelKubernetesLander.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/ParallelKubernetesLander.java
index 6f5aa33..071cd22 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/ParallelKubernetesLander.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/ParallelKubernetesLander.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/PodNameFactory.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/PodNameFactory.java
index b1ce97c..982fc06 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/PodNameFactory.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/PodNameFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/PodWatcher.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/PodWatcher.java
index f77e5f9..530b823 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/PodWatcher.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/lander/kubernetes/PodWatcher.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/Destinations.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/Destinations.java
index 544a85c..2611bd9 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/Destinations.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/Destinations.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/Hive.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/Hive.java
index 0aa89e4..16cb788 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/Hive.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/Hive.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/HiveRoad.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/HiveRoad.java
index 1aa7268..e67f58e 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/HiveRoad.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/HiveRoad.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/HiveStatus.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/HiveStatus.java
index 54d4c70..25c6016 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/HiveStatus.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/HiveStatus.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/KafkaStatus.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/KafkaStatus.java
index 1db272e..2eaf215 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/KafkaStatus.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/model/KafkaStatus.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/serde/OffsetDateTimeDeserializer.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/serde/OffsetDateTimeDeserializer.java
index 3ed9ce4..4e7762c 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/serde/OffsetDateTimeDeserializer.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/serde/OffsetDateTimeDeserializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/serde/OffsetDateTimeSerializer.java b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/serde/OffsetDateTimeSerializer.java
index 749ab40..0abad16 100644
--- a/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/serde/OffsetDateTimeSerializer.java
+++ b/agent/loading-bay/app/src/main/java/com/hotels/road/loadingbay/serde/OffsetDateTimeSerializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/resources/hive-site.xml b/agent/loading-bay/app/src/main/resources/hive-site.xml
index 9151613..0a53c3d 100644
--- a/agent/loading-bay/app/src/main/resources/hive-site.xml
+++ b/agent/loading-bay/app/src/main/resources/hive-site.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/resources/hivemetastore-site.xml b/agent/loading-bay/app/src/main/resources/hivemetastore-site.xml
index 9151613..0a53c3d 100644
--- a/agent/loading-bay/app/src/main/resources/hivemetastore-site.xml
+++ b/agent/loading-bay/app/src/main/resources/hivemetastore-site.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/resources/hiveserver2-site.xml b/agent/loading-bay/app/src/main/resources/hiveserver2-site.xml
index 9151613..0a53c3d 100644
--- a/agent/loading-bay/app/src/main/resources/hiveserver2-site.xml
+++ b/agent/loading-bay/app/src/main/resources/hiveserver2-site.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/main/resources/logback-spring.xml b/agent/loading-bay/app/src/main/resources/logback-spring.xml
index 0d16d4d..fb26058 100644
--- a/agent/loading-bay/app/src/main/resources/logback-spring.xml
+++ b/agent/loading-bay/app/src/main/resources/logback-spring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/HiveModelReaderTest.java b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/HiveModelReaderTest.java
index d2f1e52..02b49e4 100644
--- a/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/HiveModelReaderTest.java
+++ b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/HiveModelReaderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/HiveStatusPatchBuilderTest.java b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/HiveStatusPatchBuilderTest.java
index f330ec8..22470fe 100644
--- a/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/HiveStatusPatchBuilderTest.java
+++ b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/HiveStatusPatchBuilderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/HiveTableActionTest.java b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/HiveTableActionTest.java
index 4a88b3d..31a98e9 100644
--- a/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/HiveTableActionTest.java
+++ b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/HiveTableActionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/LanderMonitorTest.java b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/LanderMonitorTest.java
index ed81b6f..f28cdf0 100644
--- a/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/LanderMonitorTest.java
+++ b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/LanderMonitorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/LanderTaskRunnerTest.java b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/LanderTaskRunnerTest.java
index 42fe3d6..188d4f4 100644
--- a/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/LanderTaskRunnerTest.java
+++ b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/LanderTaskRunnerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/LoadingBayTest.java b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/LoadingBayTest.java
index 4b52db6..ca543e9 100644
--- a/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/LoadingBayTest.java
+++ b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/LoadingBayTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/OffsetManagerTest.java b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/OffsetManagerTest.java
index e8e545a..d116d8e 100644
--- a/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/OffsetManagerTest.java
+++ b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/OffsetManagerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/TruckParkActionTest.java b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/TruckParkActionTest.java
index f399295..3084502 100644
--- a/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/TruckParkActionTest.java
+++ b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/TruckParkActionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/event/HiveNotificationHandlerTest.java b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/event/HiveNotificationHandlerTest.java
index 21106a6..3db9720 100644
--- a/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/event/HiveNotificationHandlerTest.java
+++ b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/event/HiveNotificationHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/ArgsFactoryTest.java b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/ArgsFactoryTest.java
index 9d0b0b7..48737d8 100644
--- a/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/ArgsFactoryTest.java
+++ b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/ArgsFactoryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/ConfigMapSupplierTest.java b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/ConfigMapSupplierTest.java
index 70ebb56..571c45f 100644
--- a/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/ConfigMapSupplierTest.java
+++ b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/ConfigMapSupplierTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/KubernetesLanderTest.java b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/KubernetesLanderTest.java
index f58b34b..6b39487 100644
--- a/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/KubernetesLanderTest.java
+++ b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/KubernetesLanderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/LanderPodFactoryTest.java b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/LanderPodFactoryTest.java
index dd2ee57..ee7d08a 100644
--- a/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/LanderPodFactoryTest.java
+++ b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/LanderPodFactoryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/ParallelKubernetesLanderTest.java b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/ParallelKubernetesLanderTest.java
index a9f56ce..1fb0505 100644
--- a/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/ParallelKubernetesLanderTest.java
+++ b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/ParallelKubernetesLanderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/PodNameFactoryTest.java b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/PodNameFactoryTest.java
index 35224af..9951603 100644
--- a/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/PodNameFactoryTest.java
+++ b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/PodNameFactoryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/PodWatcherTest.java b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/PodWatcherTest.java
index cb3138f..2410d06 100644
--- a/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/PodWatcherTest.java
+++ b/agent/loading-bay/app/src/test/java/com/hotels/road/loadingbay/lander/kubernetes/PodWatcherTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/app/src/test/resources/logback-test.xml b/agent/loading-bay/app/src/test/resources/logback-test.xml
index 14304c2..25d6056 100644
--- a/agent/loading-bay/app/src/test/resources/logback-test.xml
+++ b/agent/loading-bay/app/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/AvroHiveTableStrategy.java b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/AvroHiveTableStrategy.java
index cbac758..3044492 100644
--- a/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/AvroHiveTableStrategy.java
+++ b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/AvroHiveTableStrategy.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/AvroStorageDescriptorFactory.java b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/AvroStorageDescriptorFactory.java
index bdc41e7..9137906 100644
--- a/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/AvroStorageDescriptorFactory.java
+++ b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/AvroStorageDescriptorFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/HiveConfFactory.java b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/HiveConfFactory.java
index a5f132a..0b86c0d 100644
--- a/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/HiveConfFactory.java
+++ b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/HiveConfFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/HivePartitionManager.java b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/HivePartitionManager.java
index d25da4f..80c5982 100644
--- a/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/HivePartitionManager.java
+++ b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/HivePartitionManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/HiveTableManager.java b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/HiveTableManager.java
index bd37444..4a3928f 100644
--- a/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/HiveTableManager.java
+++ b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/HiveTableManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/HiveTableStrategy.java b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/HiveTableStrategy.java
index df02497..2924baf 100644
--- a/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/HiveTableStrategy.java
+++ b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/HiveTableStrategy.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/LocationResolver.java b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/LocationResolver.java
index e56afa1..2d141b2 100644
--- a/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/LocationResolver.java
+++ b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/LocationResolver.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/MetaStoreClientFactory.java b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/MetaStoreClientFactory.java
index 6a91656..62c5264 100644
--- a/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/MetaStoreClientFactory.java
+++ b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/MetaStoreClientFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/MetaStoreException.java b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/MetaStoreException.java
index 8d6c535..8e178b4 100644
--- a/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/MetaStoreException.java
+++ b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/MetaStoreException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/SchemaUriResolver.java b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/SchemaUriResolver.java
index 5ff0054..69d9133 100644
--- a/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/SchemaUriResolver.java
+++ b/agent/loading-bay/metastore/core/src/main/java/com/hotels/road/hive/metastore/SchemaUriResolver.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/core/src/test/java/com/hotels/road/hive/metastore/AvroHiveTableStrategyTest.java b/agent/loading-bay/metastore/core/src/test/java/com/hotels/road/hive/metastore/AvroHiveTableStrategyTest.java
index 0c6ac54..d322fa1 100644
--- a/agent/loading-bay/metastore/core/src/test/java/com/hotels/road/hive/metastore/AvroHiveTableStrategyTest.java
+++ b/agent/loading-bay/metastore/core/src/test/java/com/hotels/road/hive/metastore/AvroHiveTableStrategyTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/core/src/test/java/com/hotels/road/hive/metastore/HivePartitionManagerTest.java b/agent/loading-bay/metastore/core/src/test/java/com/hotels/road/hive/metastore/HivePartitionManagerTest.java
index eadb825..625c67f 100644
--- a/agent/loading-bay/metastore/core/src/test/java/com/hotels/road/hive/metastore/HivePartitionManagerTest.java
+++ b/agent/loading-bay/metastore/core/src/test/java/com/hotels/road/hive/metastore/HivePartitionManagerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/core/src/test/java/com/hotels/road/hive/metastore/HiveTableManagerTest.java b/agent/loading-bay/metastore/core/src/test/java/com/hotels/road/hive/metastore/HiveTableManagerTest.java
index df0d400..c9b1287 100644
--- a/agent/loading-bay/metastore/core/src/test/java/com/hotels/road/hive/metastore/HiveTableManagerTest.java
+++ b/agent/loading-bay/metastore/core/src/test/java/com/hotels/road/hive/metastore/HiveTableManagerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/core/src/test/resources/logback-test.xml b/agent/loading-bay/metastore/core/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/agent/loading-bay/metastore/core/src/test/resources/logback-test.xml
+++ b/agent/loading-bay/metastore/core/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/s3/src/main/java/com/hotels/road/hive/metastore/s3/S3LocationResolver.java b/agent/loading-bay/metastore/s3/src/main/java/com/hotels/road/hive/metastore/s3/S3LocationResolver.java
index 3c9cf1c..304bb15 100644
--- a/agent/loading-bay/metastore/s3/src/main/java/com/hotels/road/hive/metastore/s3/S3LocationResolver.java
+++ b/agent/loading-bay/metastore/s3/src/main/java/com/hotels/road/hive/metastore/s3/S3LocationResolver.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/s3/src/main/java/com/hotels/road/hive/metastore/s3/S3SchemaUriResolver.java b/agent/loading-bay/metastore/s3/src/main/java/com/hotels/road/hive/metastore/s3/S3SchemaUriResolver.java
index 375f64a..17823a1 100644
--- a/agent/loading-bay/metastore/s3/src/main/java/com/hotels/road/hive/metastore/s3/S3SchemaUriResolver.java
+++ b/agent/loading-bay/metastore/s3/src/main/java/com/hotels/road/hive/metastore/s3/S3SchemaUriResolver.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/s3/src/test/java/com/hotels/road/hive/metastore/s3/S3LocationResolverTest.java b/agent/loading-bay/metastore/s3/src/test/java/com/hotels/road/hive/metastore/s3/S3LocationResolverTest.java
index 04c8856..2a1ed93 100644
--- a/agent/loading-bay/metastore/s3/src/test/java/com/hotels/road/hive/metastore/s3/S3LocationResolverTest.java
+++ b/agent/loading-bay/metastore/s3/src/test/java/com/hotels/road/hive/metastore/s3/S3LocationResolverTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/s3/src/test/java/com/hotels/road/hive/metastore/s3/S3SchemaUriResolverTest.java b/agent/loading-bay/metastore/s3/src/test/java/com/hotels/road/hive/metastore/s3/S3SchemaUriResolverTest.java
index 65c2596..57ea6a4 100644
--- a/agent/loading-bay/metastore/s3/src/test/java/com/hotels/road/hive/metastore/s3/S3SchemaUriResolverTest.java
+++ b/agent/loading-bay/metastore/s3/src/test/java/com/hotels/road/hive/metastore/s3/S3SchemaUriResolverTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/metastore/s3/src/test/resources/logback-test.xml b/agent/loading-bay/metastore/s3/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/agent/loading-bay/metastore/s3/src/test/resources/logback-test.xml
+++ b/agent/loading-bay/metastore/s3/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/app/src/main/java/com/hotels/road/truck/park/TruckParkApp.java b/agent/loading-bay/truck-park/app/src/main/java/com/hotels/road/truck/park/TruckParkApp.java
index 28782a5..4e8917a 100644
--- a/agent/loading-bay/truck-park/app/src/main/java/com/hotels/road/truck/park/TruckParkApp.java
+++ b/agent/loading-bay/truck-park/app/src/main/java/com/hotels/road/truck/park/TruckParkApp.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/app/src/main/resources/logback-spring.xml b/agent/loading-bay/truck-park/app/src/main/resources/logback-spring.xml
index 0d16d4d..fb26058 100644
--- a/agent/loading-bay/truck-park/app/src/main/resources/logback-spring.xml
+++ b/agent/loading-bay/truck-park/app/src/main/resources/logback-spring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/avro/src/main/java/com/hotels/road/truck/park/avro/AvroConfiguration.java b/agent/loading-bay/truck-park/avro/src/main/java/com/hotels/road/truck/park/avro/AvroConfiguration.java
index 5b24df1..7ba0347 100644
--- a/agent/loading-bay/truck-park/avro/src/main/java/com/hotels/road/truck/park/avro/AvroConfiguration.java
+++ b/agent/loading-bay/truck-park/avro/src/main/java/com/hotels/road/truck/park/avro/AvroConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/avro/src/main/java/com/hotels/road/truck/park/avro/AvroRecordWriter.java b/agent/loading-bay/truck-park/avro/src/main/java/com/hotels/road/truck/park/avro/AvroRecordWriter.java
index f787493..94ae20f 100644
--- a/agent/loading-bay/truck-park/avro/src/main/java/com/hotels/road/truck/park/avro/AvroRecordWriter.java
+++ b/agent/loading-bay/truck-park/avro/src/main/java/com/hotels/road/truck/park/avro/AvroRecordWriter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/avro/src/test/java/com/hotels/road/truck/park/avro/AvroRecordWriterTest.java b/agent/loading-bay/truck-park/avro/src/test/java/com/hotels/road/truck/park/avro/AvroRecordWriterTest.java
index 98f54b8..ad70949 100644
--- a/agent/loading-bay/truck-park/avro/src/test/java/com/hotels/road/truck/park/avro/AvroRecordWriterTest.java
+++ b/agent/loading-bay/truck-park/avro/src/test/java/com/hotels/road/truck/park/avro/AvroRecordWriterTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/avro/src/test/resources/logback-test.xml b/agent/loading-bay/truck-park/avro/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/agent/loading-bay/truck-park/avro/src/test/resources/logback-test.xml
+++ b/agent/loading-bay/truck-park/avro/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/ConsumerCountOutputStream.java b/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/ConsumerCountOutputStream.java
index 650712e..14a747f 100644
--- a/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/ConsumerCountOutputStream.java
+++ b/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/ConsumerCountOutputStream.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/ConsumerRecordWriter.java b/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/ConsumerRecordWriter.java
index d4f8371..627fc71 100644
--- a/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/ConsumerRecordWriter.java
+++ b/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/ConsumerRecordWriter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/NullDeserializer.java b/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/NullDeserializer.java
index 1333b5c..952aeaf 100644
--- a/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/NullDeserializer.java
+++ b/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/NullDeserializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/Offsets.java b/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/Offsets.java
index 8ba904f..88a5c17 100644
--- a/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/Offsets.java
+++ b/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/Offsets.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/TruckPark.java b/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/TruckPark.java
index 2d86ba9..a83ad6e 100644
--- a/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/TruckPark.java
+++ b/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/TruckPark.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/TruckParkConfiguration.java b/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/TruckParkConfiguration.java
index 9ec8cdd..0c3ff9f 100644
--- a/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/TruckParkConfiguration.java
+++ b/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/TruckParkConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/metrics/Metrics.java b/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/metrics/Metrics.java
index 02aa146..366a23e 100644
--- a/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/metrics/Metrics.java
+++ b/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/metrics/Metrics.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/metrics/MetricsConfiguration.java b/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/metrics/MetricsConfiguration.java
index d1d4143..d186721 100644
--- a/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/metrics/MetricsConfiguration.java
+++ b/agent/loading-bay/truck-park/core/src/main/java/com/hotels/road/truck/park/metrics/MetricsConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/core/src/test/java/com/hotels/road/truck/park/ConsumerCountOutputStreamTest.java b/agent/loading-bay/truck-park/core/src/test/java/com/hotels/road/truck/park/ConsumerCountOutputStreamTest.java
index 061edb1..9fcd23a 100644
--- a/agent/loading-bay/truck-park/core/src/test/java/com/hotels/road/truck/park/ConsumerCountOutputStreamTest.java
+++ b/agent/loading-bay/truck-park/core/src/test/java/com/hotels/road/truck/park/ConsumerCountOutputStreamTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/core/src/test/java/com/hotels/road/truck/park/ConsumerRecordWriterTest.java b/agent/loading-bay/truck-park/core/src/test/java/com/hotels/road/truck/park/ConsumerRecordWriterTest.java
index ede545b..9922787 100644
--- a/agent/loading-bay/truck-park/core/src/test/java/com/hotels/road/truck/park/ConsumerRecordWriterTest.java
+++ b/agent/loading-bay/truck-park/core/src/test/java/com/hotels/road/truck/park/ConsumerRecordWriterTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/core/src/test/java/com/hotels/road/truck/park/TruckParkTest.java b/agent/loading-bay/truck-park/core/src/test/java/com/hotels/road/truck/park/TruckParkTest.java
index f834838..bb537e8 100644
--- a/agent/loading-bay/truck-park/core/src/test/java/com/hotels/road/truck/park/TruckParkTest.java
+++ b/agent/loading-bay/truck-park/core/src/test/java/com/hotels/road/truck/park/TruckParkTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/core/src/test/java/com/hotels/road/truck/park/metrics/MetricsTest.java b/agent/loading-bay/truck-park/core/src/test/java/com/hotels/road/truck/park/metrics/MetricsTest.java
index 64bc498..fc2edbf 100644
--- a/agent/loading-bay/truck-park/core/src/test/java/com/hotels/road/truck/park/metrics/MetricsTest.java
+++ b/agent/loading-bay/truck-park/core/src/test/java/com/hotels/road/truck/park/metrics/MetricsTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/core/src/test/resources/logback-test.xml b/agent/loading-bay/truck-park/core/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/agent/loading-bay/truck-park/core/src/test/resources/logback-test.xml
+++ b/agent/loading-bay/truck-park/core/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/integration-tests/src/test/java/com/hotels/road/truck/park/TruckParkAppIntegrationTest.java b/agent/loading-bay/truck-park/integration-tests/src/test/java/com/hotels/road/truck/park/TruckParkAppIntegrationTest.java
index ccfc2b0..bab3dd5 100644
--- a/agent/loading-bay/truck-park/integration-tests/src/test/java/com/hotels/road/truck/park/TruckParkAppIntegrationTest.java
+++ b/agent/loading-bay/truck-park/integration-tests/src/test/java/com/hotels/road/truck/park/TruckParkAppIntegrationTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/integration-tests/src/test/resources/logback-test.xml b/agent/loading-bay/truck-park/integration-tests/src/test/resources/logback-test.xml
index 1ae6f0f..314cab4 100644
--- a/agent/loading-bay/truck-park/integration-tests/src/test/resources/logback-test.xml
+++ b/agent/loading-bay/truck-park/integration-tests/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/DataDeserializer.java b/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/DataDeserializer.java
index ea7cbf5..7769c01 100644
--- a/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/DataDeserializer.java
+++ b/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/DataDeserializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/SchemaLookup.java b/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/SchemaLookup.java
index cd12d13..9d2810a 100644
--- a/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/SchemaLookup.java
+++ b/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/SchemaLookup.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/gdpr/PiiBytesConversion.java b/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/gdpr/PiiBytesConversion.java
index e0f00fd..e62c104 100644
--- a/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/gdpr/PiiBytesConversion.java
+++ b/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/gdpr/PiiBytesConversion.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/gdpr/PiiConfiguration.java b/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/gdpr/PiiConfiguration.java
index c8c035c..37f593d 100644
--- a/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/gdpr/PiiConfiguration.java
+++ b/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/gdpr/PiiConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/gdpr/PiiLogicalTypeSchemaLookup.java b/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/gdpr/PiiLogicalTypeSchemaLookup.java
index 0176477..42cd1d6 100644
--- a/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/gdpr/PiiLogicalTypeSchemaLookup.java
+++ b/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/gdpr/PiiLogicalTypeSchemaLookup.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/gdpr/PiiStringConversion.java b/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/gdpr/PiiStringConversion.java
index 08b17fc..bc6dc52 100644
--- a/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/gdpr/PiiStringConversion.java
+++ b/agent/loading-bay/truck-park/road-decoder/src/main/java/com/hotels/road/truck/park/decoder/gdpr/PiiStringConversion.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/DataDeserializerGdprTest.java b/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/DataDeserializerGdprTest.java
index 8e771c6..03438c8 100644
--- a/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/DataDeserializerGdprTest.java
+++ b/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/DataDeserializerGdprTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/DataDeserializerTest.java b/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/DataDeserializerTest.java
index bd9722b..2dd9a8f 100644
--- a/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/DataDeserializerTest.java
+++ b/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/DataDeserializerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/gdpr/PiiBytesConversionTest.java b/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/gdpr/PiiBytesConversionTest.java
index 17ec6ed..fbf78c4 100644
--- a/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/gdpr/PiiBytesConversionTest.java
+++ b/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/gdpr/PiiBytesConversionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/gdpr/PiiLogicalTypeSchemaLookupTest.java b/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/gdpr/PiiLogicalTypeSchemaLookupTest.java
index b52792a..8799a03 100644
--- a/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/gdpr/PiiLogicalTypeSchemaLookupTest.java
+++ b/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/gdpr/PiiLogicalTypeSchemaLookupTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/gdpr/PiiStringConversionTest.java b/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/gdpr/PiiStringConversionTest.java
index ec8a65b..f75b152 100644
--- a/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/gdpr/PiiStringConversionTest.java
+++ b/agent/loading-bay/truck-park/road-decoder/src/test/java/com/hotels/road/truck/park/decoder/gdpr/PiiStringConversionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/road-decoder/src/test/resources/logback-test.xml b/agent/loading-bay/truck-park/road-decoder/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/agent/loading-bay/truck-park/road-decoder/src/test/resources/logback-test.xml
+++ b/agent/loading-bay/truck-park/road-decoder/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/road-schema/src/main/java/com/hotels/road/truck/park/schema/KafkaStoreSchemaLookup.java b/agent/loading-bay/truck-park/road-schema/src/main/java/com/hotels/road/truck/park/schema/KafkaStoreSchemaLookup.java
index fba8bf7..ddd3905 100644
--- a/agent/loading-bay/truck-park/road-schema/src/main/java/com/hotels/road/truck/park/schema/KafkaStoreSchemaLookup.java
+++ b/agent/loading-bay/truck-park/road-schema/src/main/java/com/hotels/road/truck/park/schema/KafkaStoreSchemaLookup.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/road-schema/src/main/java/com/hotels/road/truck/park/schema/RoadSchemaConfiguration.java b/agent/loading-bay/truck-park/road-schema/src/main/java/com/hotels/road/truck/park/schema/RoadSchemaConfiguration.java
index 793777a..7d965ac 100644
--- a/agent/loading-bay/truck-park/road-schema/src/main/java/com/hotels/road/truck/park/schema/RoadSchemaConfiguration.java
+++ b/agent/loading-bay/truck-park/road-schema/src/main/java/com/hotels/road/truck/park/schema/RoadSchemaConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/road-schema/src/test/java/com/hotels/road/truck/park/schema/KafkaStoreSchemaLookupTest.java b/agent/loading-bay/truck-park/road-schema/src/test/java/com/hotels/road/truck/park/schema/KafkaStoreSchemaLookupTest.java
index c3f04d7..f698467 100644
--- a/agent/loading-bay/truck-park/road-schema/src/test/java/com/hotels/road/truck/park/schema/KafkaStoreSchemaLookupTest.java
+++ b/agent/loading-bay/truck-park/road-schema/src/test/java/com/hotels/road/truck/park/schema/KafkaStoreSchemaLookupTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/road-schema/src/test/resources/logback-test.xml b/agent/loading-bay/truck-park/road-schema/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/agent/loading-bay/truck-park/road-schema/src/test/resources/logback-test.xml
+++ b/agent/loading-bay/truck-park/road-schema/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/s3/src/main/java/com/hotels/road/truck/park/s3/KeySupplier.java b/agent/loading-bay/truck-park/s3/src/main/java/com/hotels/road/truck/park/s3/KeySupplier.java
index 00ad202..0ce0257 100644
--- a/agent/loading-bay/truck-park/s3/src/main/java/com/hotels/road/truck/park/s3/KeySupplier.java
+++ b/agent/loading-bay/truck-park/s3/src/main/java/com/hotels/road/truck/park/s3/KeySupplier.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/s3/src/main/java/com/hotels/road/truck/park/s3/S3Configuration.java b/agent/loading-bay/truck-park/s3/src/main/java/com/hotels/road/truck/park/s3/S3Configuration.java
index 2462a3d..6fae221 100644
--- a/agent/loading-bay/truck-park/s3/src/main/java/com/hotels/road/truck/park/s3/S3Configuration.java
+++ b/agent/loading-bay/truck-park/s3/src/main/java/com/hotels/road/truck/park/s3/S3Configuration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/s3/src/test/java/com/hotels/road/truck/park/s3/KeySupplierTest.java b/agent/loading-bay/truck-park/s3/src/test/java/com/hotels/road/truck/park/s3/KeySupplierTest.java
index 609a547..1faa7ff 100644
--- a/agent/loading-bay/truck-park/s3/src/test/java/com/hotels/road/truck/park/s3/KeySupplierTest.java
+++ b/agent/loading-bay/truck-park/s3/src/test/java/com/hotels/road/truck/park/s3/KeySupplierTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/s3/src/test/resources/logback-test.xml b/agent/loading-bay/truck-park/s3/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/agent/loading-bay/truck-park/s3/src/test/resources/logback-test.xml
+++ b/agent/loading-bay/truck-park/s3/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/spi/src/main/java/com/hotels/road/truck/park/spi/AbortableOutputStreamFactory.java b/agent/loading-bay/truck-park/spi/src/main/java/com/hotels/road/truck/park/spi/AbortableOutputStreamFactory.java
index 8d540df..bfee105 100644
--- a/agent/loading-bay/truck-park/spi/src/main/java/com/hotels/road/truck/park/spi/AbortableOutputStreamFactory.java
+++ b/agent/loading-bay/truck-park/spi/src/main/java/com/hotels/road/truck/park/spi/AbortableOutputStreamFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/spi/src/main/java/com/hotels/road/truck/park/spi/RecordWriter.java b/agent/loading-bay/truck-park/spi/src/main/java/com/hotels/road/truck/park/spi/RecordWriter.java
index 193043e..0c84f04 100644
--- a/agent/loading-bay/truck-park/spi/src/main/java/com/hotels/road/truck/park/spi/RecordWriter.java
+++ b/agent/loading-bay/truck-park/spi/src/main/java/com/hotels/road/truck/park/spi/RecordWriter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/loading-bay/truck-park/spi/src/main/java/com/hotels/road/truck/park/spi/Writer.java b/agent/loading-bay/truck-park/spi/src/main/java/com/hotels/road/truck/park/spi/Writer.java
index 8a6af74..de4e47f 100644
--- a/agent/loading-bay/truck-park/spi/src/main/java/com/hotels/road/truck/park/spi/Writer.java
+++ b/agent/loading-bay/truck-park/spi/src/main/java/com/hotels/road/truck/park/spi/Writer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/client-api/src/main/java/com/hotels/road/tollbooth/client/api/Operation.java b/agent/tollbooth/client-api/src/main/java/com/hotels/road/tollbooth/client/api/Operation.java
index 298d03c..fdfd159 100644
--- a/agent/tollbooth/client-api/src/main/java/com/hotels/road/tollbooth/client/api/Operation.java
+++ b/agent/tollbooth/client-api/src/main/java/com/hotels/road/tollbooth/client/api/Operation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/client-api/src/main/java/com/hotels/road/tollbooth/client/api/PatchOperation.java b/agent/tollbooth/client-api/src/main/java/com/hotels/road/tollbooth/client/api/PatchOperation.java
index 1b5aae0..5d3a127 100644
--- a/agent/tollbooth/client-api/src/main/java/com/hotels/road/tollbooth/client/api/PatchOperation.java
+++ b/agent/tollbooth/client-api/src/main/java/com/hotels/road/tollbooth/client/api/PatchOperation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/client-api/src/main/java/com/hotels/road/tollbooth/client/api/PatchSet.java b/agent/tollbooth/client-api/src/main/java/com/hotels/road/tollbooth/client/api/PatchSet.java
index e066172..9970ce9 100644
--- a/agent/tollbooth/client-api/src/main/java/com/hotels/road/tollbooth/client/api/PatchSet.java
+++ b/agent/tollbooth/client-api/src/main/java/com/hotels/road/tollbooth/client/api/PatchSet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/client-api/src/main/java/com/hotels/road/tollbooth/client/spi/PatchSetEmitter.java b/agent/tollbooth/client-api/src/main/java/com/hotels/road/tollbooth/client/spi/PatchSetEmitter.java
index aedcda4..81abd74 100644
--- a/agent/tollbooth/client-api/src/main/java/com/hotels/road/tollbooth/client/spi/PatchSetEmitter.java
+++ b/agent/tollbooth/client-api/src/main/java/com/hotels/road/tollbooth/client/spi/PatchSetEmitter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/client-api/src/test/java/com/hotels/road/tollbooth/client/api/OperationTest.java b/agent/tollbooth/client-api/src/test/java/com/hotels/road/tollbooth/client/api/OperationTest.java
index 689c3df..e900ab4 100644
--- a/agent/tollbooth/client-api/src/test/java/com/hotels/road/tollbooth/client/api/OperationTest.java
+++ b/agent/tollbooth/client-api/src/test/java/com/hotels/road/tollbooth/client/api/OperationTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/client-api/src/test/resources/logback-test.xml b/agent/tollbooth/client-api/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/agent/tollbooth/client-api/src/test/resources/logback-test.xml
+++ b/agent/tollbooth/client-api/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/client-kafka/src/main/java/com/hotels/road/tollbooth/client/kafka/KafkaPatchSetEmitter.java b/agent/tollbooth/client-kafka/src/main/java/com/hotels/road/tollbooth/client/kafka/KafkaPatchSetEmitter.java
index c62d3ea..1a70105 100644
--- a/agent/tollbooth/client-kafka/src/main/java/com/hotels/road/tollbooth/client/kafka/KafkaPatchSetEmitter.java
+++ b/agent/tollbooth/client-kafka/src/main/java/com/hotels/road/tollbooth/client/kafka/KafkaPatchSetEmitter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/client-kafka/src/main/java/com/hotels/road/tollbooth/client/kafka/serde/PatchSetSerializer.java b/agent/tollbooth/client-kafka/src/main/java/com/hotels/road/tollbooth/client/kafka/serde/PatchSetSerializer.java
index 3e0af6e..a7fa00f 100644
--- a/agent/tollbooth/client-kafka/src/main/java/com/hotels/road/tollbooth/client/kafka/serde/PatchSetSerializer.java
+++ b/agent/tollbooth/client-kafka/src/main/java/com/hotels/road/tollbooth/client/kafka/serde/PatchSetSerializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/client-kafka/src/test/java/com/hotels/road/tollbooth/client/kafka/KafkaPatchSetEmitterTest.java b/agent/tollbooth/client-kafka/src/test/java/com/hotels/road/tollbooth/client/kafka/KafkaPatchSetEmitterTest.java
index 17ab537..6b7de1f 100644
--- a/agent/tollbooth/client-kafka/src/test/java/com/hotels/road/tollbooth/client/kafka/KafkaPatchSetEmitterTest.java
+++ b/agent/tollbooth/client-kafka/src/test/java/com/hotels/road/tollbooth/client/kafka/KafkaPatchSetEmitterTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/client-kafka/src/test/java/com/hotels/road/tollbooth/client/kafka/serde/PatchSetSerializerTest.java b/agent/tollbooth/client-kafka/src/test/java/com/hotels/road/tollbooth/client/kafka/serde/PatchSetSerializerTest.java
index 806fe5e..3675ea7 100644
--- a/agent/tollbooth/client-kafka/src/test/java/com/hotels/road/tollbooth/client/kafka/serde/PatchSetSerializerTest.java
+++ b/agent/tollbooth/client-kafka/src/test/java/com/hotels/road/tollbooth/client/kafka/serde/PatchSetSerializerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/client-kafka/src/test/resources/logback-test.xml b/agent/tollbooth/client-kafka/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/agent/tollbooth/client-kafka/src/test/resources/logback-test.xml
+++ b/agent/tollbooth/client-kafka/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/JsonNodeSerializer.java b/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/JsonNodeSerializer.java
index 6b8f35e..f61838c 100644
--- a/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/JsonNodeSerializer.java
+++ b/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/JsonNodeSerializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/JsonPatchApplier.java b/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/JsonPatchApplier.java
index 5bf456e..54773df 100644
--- a/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/JsonPatchApplier.java
+++ b/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/JsonPatchApplier.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/PatchApplicationException.java b/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/PatchApplicationException.java
index 8d6a31a..be1f571 100644
--- a/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/PatchApplicationException.java
+++ b/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/PatchApplicationException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/PatchProcessor.java b/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/PatchProcessor.java
index 66ddc6a..b9163c8 100644
--- a/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/PatchProcessor.java
+++ b/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/PatchProcessor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/RootController.java b/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/RootController.java
index 5da3721..cda005e 100644
--- a/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/RootController.java
+++ b/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/RootController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/TollBooth.java b/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/TollBooth.java
index 8c67b0e..2d15cc6 100644
--- a/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/TollBooth.java
+++ b/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/TollBooth.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/TollboothApp.java b/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/TollboothApp.java
index 2e04a14..0eb79f9 100644
--- a/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/TollboothApp.java
+++ b/agent/tollbooth/road-tollbooth-app/src/main/java/com/hotels/road/tollbooth/app/TollboothApp.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/road-tollbooth-app/src/main/resources/logback-spring.xml b/agent/tollbooth/road-tollbooth-app/src/main/resources/logback-spring.xml
index 0d16d4d..fb26058 100644
--- a/agent/tollbooth/road-tollbooth-app/src/main/resources/logback-spring.xml
+++ b/agent/tollbooth/road-tollbooth-app/src/main/resources/logback-spring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/road-tollbooth-app/src/test/java/com/hotels/road/tollbooth/app/JsonPatchApplierTest.java b/agent/tollbooth/road-tollbooth-app/src/test/java/com/hotels/road/tollbooth/app/JsonPatchApplierTest.java
index 0e597f4..9eeb6af 100644
--- a/agent/tollbooth/road-tollbooth-app/src/test/java/com/hotels/road/tollbooth/app/JsonPatchApplierTest.java
+++ b/agent/tollbooth/road-tollbooth-app/src/test/java/com/hotels/road/tollbooth/app/JsonPatchApplierTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/road-tollbooth-app/src/test/java/com/hotels/road/tollbooth/app/PatchProcessorTest.java b/agent/tollbooth/road-tollbooth-app/src/test/java/com/hotels/road/tollbooth/app/PatchProcessorTest.java
index eb5c981..c437fb8 100644
--- a/agent/tollbooth/road-tollbooth-app/src/test/java/com/hotels/road/tollbooth/app/PatchProcessorTest.java
+++ b/agent/tollbooth/road-tollbooth-app/src/test/java/com/hotels/road/tollbooth/app/PatchProcessorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/road-tollbooth-app/src/test/java/com/hotels/road/tollbooth/app/RootControllerTest.java b/agent/tollbooth/road-tollbooth-app/src/test/java/com/hotels/road/tollbooth/app/RootControllerTest.java
index 08ef0dd..88cb27f 100644
--- a/agent/tollbooth/road-tollbooth-app/src/test/java/com/hotels/road/tollbooth/app/RootControllerTest.java
+++ b/agent/tollbooth/road-tollbooth-app/src/test/java/com/hotels/road/tollbooth/app/RootControllerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/road-tollbooth-app/src/test/java/com/hotels/road/tollbooth/app/TollboothAppIntegrationTest.java b/agent/tollbooth/road-tollbooth-app/src/test/java/com/hotels/road/tollbooth/app/TollboothAppIntegrationTest.java
index 0fe49a1..41fb029 100644
--- a/agent/tollbooth/road-tollbooth-app/src/test/java/com/hotels/road/tollbooth/app/TollboothAppIntegrationTest.java
+++ b/agent/tollbooth/road-tollbooth-app/src/test/java/com/hotels/road/tollbooth/app/TollboothAppIntegrationTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/tollbooth/road-tollbooth-app/src/test/resources/logback-test.xml b/agent/tollbooth/road-tollbooth-app/src/test/resources/logback-test.xml
index e15eef7..50e917a 100644
--- a/agent/tollbooth/road-tollbooth-app/src/test/resources/logback-test.xml
+++ b/agent/tollbooth/road-tollbooth-app/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/towtruck/src/main/java/com/hotels/road/towtruck/JsonNodeSerializer.java b/agent/towtruck/src/main/java/com/hotels/road/towtruck/JsonNodeSerializer.java
index d3dae70..cb0d4ab 100644
--- a/agent/towtruck/src/main/java/com/hotels/road/towtruck/JsonNodeSerializer.java
+++ b/agent/towtruck/src/main/java/com/hotels/road/towtruck/JsonNodeSerializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/towtruck/src/main/java/com/hotels/road/towtruck/RootController.java b/agent/towtruck/src/main/java/com/hotels/road/towtruck/RootController.java
index 31efc26..1759161 100644
--- a/agent/towtruck/src/main/java/com/hotels/road/towtruck/RootController.java
+++ b/agent/towtruck/src/main/java/com/hotels/road/towtruck/RootController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/towtruck/src/main/java/com/hotels/road/towtruck/Towtruck.java b/agent/towtruck/src/main/java/com/hotels/road/towtruck/Towtruck.java
index b5ad379..5b8e612 100644
--- a/agent/towtruck/src/main/java/com/hotels/road/towtruck/Towtruck.java
+++ b/agent/towtruck/src/main/java/com/hotels/road/towtruck/Towtruck.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/towtruck/src/main/java/com/hotels/road/towtruck/TowtruckApp.java b/agent/towtruck/src/main/java/com/hotels/road/towtruck/TowtruckApp.java
index a2eaa03..656dbfb 100644
--- a/agent/towtruck/src/main/java/com/hotels/road/towtruck/TowtruckApp.java
+++ b/agent/towtruck/src/main/java/com/hotels/road/towtruck/TowtruckApp.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/towtruck/src/main/java/com/hotels/road/towtruck/TowtruckStartup.java b/agent/towtruck/src/main/java/com/hotels/road/towtruck/TowtruckStartup.java
index e6de6c1..392e9a5 100644
--- a/agent/towtruck/src/main/java/com/hotels/road/towtruck/TowtruckStartup.java
+++ b/agent/towtruck/src/main/java/com/hotels/road/towtruck/TowtruckStartup.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/towtruck/src/main/resources/logback-spring.xml b/agent/towtruck/src/main/resources/logback-spring.xml
index 0d16d4d..fb26058 100644
--- a/agent/towtruck/src/main/resources/logback-spring.xml
+++ b/agent/towtruck/src/main/resources/logback-spring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/towtruck/src/test/java/com/hotels/road/towtruck/JsonNodeSerializerTest.java b/agent/towtruck/src/test/java/com/hotels/road/towtruck/JsonNodeSerializerTest.java
index b341207..72e6208 100644
--- a/agent/towtruck/src/test/java/com/hotels/road/towtruck/JsonNodeSerializerTest.java
+++ b/agent/towtruck/src/test/java/com/hotels/road/towtruck/JsonNodeSerializerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/towtruck/src/test/java/com/hotels/road/towtruck/TowtruckAppTest.java b/agent/towtruck/src/test/java/com/hotels/road/towtruck/TowtruckAppTest.java
index ab00e50..d3b04c4 100644
--- a/agent/towtruck/src/test/java/com/hotels/road/towtruck/TowtruckAppTest.java
+++ b/agent/towtruck/src/test/java/com/hotels/road/towtruck/TowtruckAppTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/towtruck/src/test/java/com/hotels/road/towtruck/TowtruckTest.java b/agent/towtruck/src/test/java/com/hotels/road/towtruck/TowtruckTest.java
index ac8dc4f..bb2ec0c 100644
--- a/agent/towtruck/src/test/java/com/hotels/road/towtruck/TowtruckTest.java
+++ b/agent/towtruck/src/test/java/com/hotels/road/towtruck/TowtruckTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/towtruck/src/test/resources/logback-test.xml b/agent/towtruck/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/agent/towtruck/src/test/resources/logback-test.xml
+++ b/agent/towtruck/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/KafkaAdminClient.java b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/KafkaAdminClient.java
index b284673..9a42d70 100644
--- a/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/KafkaAdminClient.java
+++ b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/KafkaAdminClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/KafkaBrokerMonitor.java b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/KafkaBrokerMonitor.java
index 6ab1e73..4e04a71 100644
--- a/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/KafkaBrokerMonitor.java
+++ b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/KafkaBrokerMonitor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/KafkaModelReader.java b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/KafkaModelReader.java
index fa93ab0..30fa681 100644
--- a/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/KafkaModelReader.java
+++ b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/KafkaModelReader.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/KafkaTopicDetails.java b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/KafkaTopicDetails.java
index 2c00685..2bed46e 100644
--- a/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/KafkaTopicDetails.java
+++ b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/KafkaTopicDetails.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/TrafficControl.java b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/TrafficControl.java
index a134a1c..2d6a152 100644
--- a/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/TrafficControl.java
+++ b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/TrafficControl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/TrafficControlApp.java b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/TrafficControlApp.java
index b7277d7..36b8f88 100644
--- a/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/TrafficControlApp.java
+++ b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/TrafficControlApp.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/UpdateModel.java b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/UpdateModel.java
index 199ff5b..6c22f31 100644
--- a/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/UpdateModel.java
+++ b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/UpdateModel.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/controller/RootController.java b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/controller/RootController.java
index fb8752b..9beeeb8 100644
--- a/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/controller/RootController.java
+++ b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/controller/RootController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/function/MessageCountPerTopicFunction.java b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/function/MessageCountPerTopicFunction.java
index 8ae9a51..2e034c6 100644
--- a/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/function/MessageCountPerTopicFunction.java
+++ b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/function/MessageCountPerTopicFunction.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/model/KafkaRoad.java b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/model/KafkaRoad.java
index 6b8842d..7ad124f 100644
--- a/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/model/KafkaRoad.java
+++ b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/model/KafkaRoad.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/model/MessageStatus.java b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/model/MessageStatus.java
index f09a5c2..f515c47 100644
--- a/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/model/MessageStatus.java
+++ b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/model/MessageStatus.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/model/TrafficControlStatus.java b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/model/TrafficControlStatus.java
index cd5057c..6f7e465 100644
--- a/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/model/TrafficControlStatus.java
+++ b/agent/traffic-control/src/main/java/com/hotels/road/trafficcontrol/model/TrafficControlStatus.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/main/resources/logback-spring.xml b/agent/traffic-control/src/main/resources/logback-spring.xml
index 0d16d4d..fb26058 100644
--- a/agent/traffic-control/src/main/resources/logback-spring.xml
+++ b/agent/traffic-control/src/main/resources/logback-spring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/KafkaBrokerMonitorTest.java b/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/KafkaBrokerMonitorTest.java
index fcfd9c1..fcca82a 100644
--- a/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/KafkaBrokerMonitorTest.java
+++ b/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/KafkaBrokerMonitorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/KafkaModelReaderTest.java b/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/KafkaModelReaderTest.java
index 7dddca7..e704a80 100644
--- a/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/KafkaModelReaderTest.java
+++ b/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/KafkaModelReaderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/TrafficControlTest.java b/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/TrafficControlTest.java
index c22cbda..14245e7 100644
--- a/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/TrafficControlTest.java
+++ b/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/TrafficControlTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/UpdateModelTest.java b/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/UpdateModelTest.java
index 80e83e3..982fdd5 100644
--- a/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/UpdateModelTest.java
+++ b/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/UpdateModelTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/it/TrafficControlIntegrationTest.java b/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/it/TrafficControlIntegrationTest.java
index 8fc8e83..53bb4d8 100644
--- a/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/it/TrafficControlIntegrationTest.java
+++ b/agent/traffic-control/src/test/java/com/hotels/road/trafficcontrol/it/TrafficControlIntegrationTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/agent/traffic-control/src/test/resources/logback-test.xml b/agent/traffic-control/src/test/resources/logback-test.xml
index e15eef7..50e917a 100644
--- a/agent/traffic-control/src/test/resources/logback-test.xml
+++ b/agent/traffic-control/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/main/java/com/hotels/road/offramp/client/CommitHandler.java b/client/offramp/src/main/java/com/hotels/road/offramp/client/CommitHandler.java
index 9c88bab..33a3c04 100644
--- a/client/offramp/src/main/java/com/hotels/road/offramp/client/CommitHandler.java
+++ b/client/offramp/src/main/java/com/hotels/road/offramp/client/CommitHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/main/java/com/hotels/road/offramp/client/Commits.java b/client/offramp/src/main/java/com/hotels/road/offramp/client/Commits.java
index 605d472..eb5f620 100644
--- a/client/offramp/src/main/java/com/hotels/road/offramp/client/Commits.java
+++ b/client/offramp/src/main/java/com/hotels/road/offramp/client/Commits.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/main/java/com/hotels/road/offramp/client/Committer.java b/client/offramp/src/main/java/com/hotels/road/offramp/client/Committer.java
index a0b3fa2..76de88e 100644
--- a/client/offramp/src/main/java/com/hotels/road/offramp/client/Committer.java
+++ b/client/offramp/src/main/java/com/hotels/road/offramp/client/Committer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/main/java/com/hotels/road/offramp/client/Configurator.java b/client/offramp/src/main/java/com/hotels/road/offramp/client/Configurator.java
index 0818f12..924ff0a 100644
--- a/client/offramp/src/main/java/com/hotels/road/offramp/client/Configurator.java
+++ b/client/offramp/src/main/java/com/hotels/road/offramp/client/Configurator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/main/java/com/hotels/road/offramp/client/EventSender.java b/client/offramp/src/main/java/com/hotels/road/offramp/client/EventSender.java
index ffc9308..e87e313 100644
--- a/client/offramp/src/main/java/com/hotels/road/offramp/client/EventSender.java
+++ b/client/offramp/src/main/java/com/hotels/road/offramp/client/EventSender.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/main/java/com/hotels/road/offramp/client/MessageProcessor.java b/client/offramp/src/main/java/com/hotels/road/offramp/client/MessageProcessor.java
index 70002ff..9fdcbcb 100644
--- a/client/offramp/src/main/java/com/hotels/road/offramp/client/MessageProcessor.java
+++ b/client/offramp/src/main/java/com/hotels/road/offramp/client/MessageProcessor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/main/java/com/hotels/road/offramp/client/ObjectMapperFactory.java b/client/offramp/src/main/java/com/hotels/road/offramp/client/ObjectMapperFactory.java
index 1d91a99..fb262c5 100644
--- a/client/offramp/src/main/java/com/hotels/road/offramp/client/ObjectMapperFactory.java
+++ b/client/offramp/src/main/java/com/hotels/road/offramp/client/ObjectMapperFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/main/java/com/hotels/road/offramp/client/OfframpClient.java b/client/offramp/src/main/java/com/hotels/road/offramp/client/OfframpClient.java
index 1625696..5d96d96 100644
--- a/client/offramp/src/main/java/com/hotels/road/offramp/client/OfframpClient.java
+++ b/client/offramp/src/main/java/com/hotels/road/offramp/client/OfframpClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/main/java/com/hotels/road/offramp/client/OfframpClientImpl.java b/client/offramp/src/main/java/com/hotels/road/offramp/client/OfframpClientImpl.java
index 226b4e6..b7487f2 100644
--- a/client/offramp/src/main/java/com/hotels/road/offramp/client/OfframpClientImpl.java
+++ b/client/offramp/src/main/java/com/hotels/road/offramp/client/OfframpClientImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/main/java/com/hotels/road/offramp/client/OfframpOptions.java b/client/offramp/src/main/java/com/hotels/road/offramp/client/OfframpOptions.java
index df2f270..04045bd 100644
--- a/client/offramp/src/main/java/com/hotels/road/offramp/client/OfframpOptions.java
+++ b/client/offramp/src/main/java/com/hotels/road/offramp/client/OfframpOptions.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/main/java/com/hotels/road/offramp/client/PayloadDeserializer.java b/client/offramp/src/main/java/com/hotels/road/offramp/client/PayloadDeserializer.java
index fbfc18a..c096716 100644
--- a/client/offramp/src/main/java/com/hotels/road/offramp/client/PayloadDeserializer.java
+++ b/client/offramp/src/main/java/com/hotels/road/offramp/client/PayloadDeserializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/main/java/com/hotels/road/offramp/client/PayloadTypeFactory.java b/client/offramp/src/main/java/com/hotels/road/offramp/client/PayloadTypeFactory.java
index 5ebd50d..33b3b9a 100644
--- a/client/offramp/src/main/java/com/hotels/road/offramp/client/PayloadTypeFactory.java
+++ b/client/offramp/src/main/java/com/hotels/road/offramp/client/PayloadTypeFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/main/java/com/hotels/road/offramp/client/WebSocket.java b/client/offramp/src/main/java/com/hotels/road/offramp/client/WebSocket.java
index cdcd502..ac6d97d 100644
--- a/client/offramp/src/main/java/com/hotels/road/offramp/client/WebSocket.java
+++ b/client/offramp/src/main/java/com/hotels/road/offramp/client/WebSocket.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/test/java/com/hotels/road/offramp/client/CommitHandlerTest.java b/client/offramp/src/test/java/com/hotels/road/offramp/client/CommitHandlerTest.java
index 619c03f..616228a 100644
--- a/client/offramp/src/test/java/com/hotels/road/offramp/client/CommitHandlerTest.java
+++ b/client/offramp/src/test/java/com/hotels/road/offramp/client/CommitHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/test/java/com/hotels/road/offramp/client/CommitsTest.java b/client/offramp/src/test/java/com/hotels/road/offramp/client/CommitsTest.java
index 24ebf2e..cc41aba 100644
--- a/client/offramp/src/test/java/com/hotels/road/offramp/client/CommitsTest.java
+++ b/client/offramp/src/test/java/com/hotels/road/offramp/client/CommitsTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/test/java/com/hotels/road/offramp/client/CommitterTest.java b/client/offramp/src/test/java/com/hotels/road/offramp/client/CommitterTest.java
index c685476..8a9f6a2 100644
--- a/client/offramp/src/test/java/com/hotels/road/offramp/client/CommitterTest.java
+++ b/client/offramp/src/test/java/com/hotels/road/offramp/client/CommitterTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/test/java/com/hotels/road/offramp/client/ConfiguratorTest.java b/client/offramp/src/test/java/com/hotels/road/offramp/client/ConfiguratorTest.java
index 1b13352..dbea719 100644
--- a/client/offramp/src/test/java/com/hotels/road/offramp/client/ConfiguratorTest.java
+++ b/client/offramp/src/test/java/com/hotels/road/offramp/client/ConfiguratorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/test/java/com/hotels/road/offramp/client/MessageProcessorTest.java b/client/offramp/src/test/java/com/hotels/road/offramp/client/MessageProcessorTest.java
index 901171a..f60a538 100644
--- a/client/offramp/src/test/java/com/hotels/road/offramp/client/MessageProcessorTest.java
+++ b/client/offramp/src/test/java/com/hotels/road/offramp/client/MessageProcessorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/test/java/com/hotels/road/offramp/client/OfframpClientImplTest.java b/client/offramp/src/test/java/com/hotels/road/offramp/client/OfframpClientImplTest.java
index 8d5ce44..9a7158e 100644
--- a/client/offramp/src/test/java/com/hotels/road/offramp/client/OfframpClientImplTest.java
+++ b/client/offramp/src/test/java/com/hotels/road/offramp/client/OfframpClientImplTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/test/java/com/hotels/road/offramp/client/OfframpOptionsTest.java b/client/offramp/src/test/java/com/hotels/road/offramp/client/OfframpOptionsTest.java
index b9747af..2711149 100644
--- a/client/offramp/src/test/java/com/hotels/road/offramp/client/OfframpOptionsTest.java
+++ b/client/offramp/src/test/java/com/hotels/road/offramp/client/OfframpOptionsTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/test/java/com/hotels/road/offramp/client/PayloadTypeFactoryTest.java b/client/offramp/src/test/java/com/hotels/road/offramp/client/PayloadTypeFactoryTest.java
index d38841d..e87ecbb 100644
--- a/client/offramp/src/test/java/com/hotels/road/offramp/client/PayloadTypeFactoryTest.java
+++ b/client/offramp/src/test/java/com/hotels/road/offramp/client/PayloadTypeFactoryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/test/java/com/hotels/road/offramp/client/WebSocketTest.java b/client/offramp/src/test/java/com/hotels/road/offramp/client/WebSocketTest.java
index 0878c1d..e88e92e 100644
--- a/client/offramp/src/test/java/com/hotels/road/offramp/client/WebSocketTest.java
+++ b/client/offramp/src/test/java/com/hotels/road/offramp/client/WebSocketTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/offramp/src/test/resources/logback-test.xml b/client/offramp/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/client/offramp/src/test/resources/logback-test.xml
+++ b/client/offramp/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/AsyncRoadClient.java b/client/onramp/src/main/java/com/hotels/road/client/AsyncRoadClient.java
index 6eb2ba5..0bc9e1e 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/AsyncRoadClient.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/AsyncRoadClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/ExponentialBackoffRetryHandler.java b/client/onramp/src/main/java/com/hotels/road/client/ExponentialBackoffRetryHandler.java
index 9d7052a..409350c 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/ExponentialBackoffRetryHandler.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/ExponentialBackoffRetryHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/OnrampOptions.java b/client/onramp/src/main/java/com/hotels/road/client/OnrampOptions.java
index d5f9ed3..3b8575d 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/OnrampOptions.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/OnrampOptions.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/RetryHandler.java b/client/onramp/src/main/java/com/hotels/road/client/RetryHandler.java
index 403614b..20f125c 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/RetryHandler.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/RetryHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/RoadClient.java b/client/onramp/src/main/java/com/hotels/road/client/RoadClient.java
index b558625..cd1c7e8 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/RoadClient.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/RoadClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/Sleeper.java b/client/onramp/src/main/java/com/hotels/road/client/Sleeper.java
index 3d235df..db4207f 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/Sleeper.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/Sleeper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/ThreadSleeper.java b/client/onramp/src/main/java/com/hotels/road/client/ThreadSleeper.java
index 836dfda..9ded1ad 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/ThreadSleeper.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/ThreadSleeper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/http/HttpClientConnectionManagerFactory.java b/client/onramp/src/main/java/com/hotels/road/client/http/HttpClientConnectionManagerFactory.java
index 3ed269f..9a78898 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/http/HttpClientConnectionManagerFactory.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/http/HttpClientConnectionManagerFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/http/HttpClientFactory.java b/client/onramp/src/main/java/com/hotels/road/client/http/HttpClientFactory.java
index ac6b9f9..252c817 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/http/HttpClientFactory.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/http/HttpClientFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/http/HttpHandler.java b/client/onramp/src/main/java/com/hotels/road/client/http/HttpHandler.java
index 105b564..5d2f071 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/http/HttpHandler.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/http/HttpHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/http/RetryHandlerWrapper.java b/client/onramp/src/main/java/com/hotels/road/client/http/RetryHandlerWrapper.java
index fac6f87..44eb10f 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/http/RetryHandlerWrapper.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/http/RetryHandlerWrapper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/partitioning/CloseableFunction.java b/client/onramp/src/main/java/com/hotels/road/client/partitioning/CloseableFunction.java
index d5ba169..8f623ff 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/partitioning/CloseableFunction.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/partitioning/CloseableFunction.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/partitioning/DefinitionSupplier.java b/client/onramp/src/main/java/com/hotels/road/client/partitioning/DefinitionSupplier.java
index fc40676..607a869 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/partitioning/DefinitionSupplier.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/partitioning/DefinitionSupplier.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/partitioning/EnqueueBehaviour.java b/client/onramp/src/main/java/com/hotels/road/client/partitioning/EnqueueBehaviour.java
index 765f37a..8d4190f 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/partitioning/EnqueueBehaviour.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/partitioning/EnqueueBehaviour.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/partitioning/MessageBatcher.java b/client/onramp/src/main/java/com/hotels/road/client/partitioning/MessageBatcher.java
index 843054c..1629c4e 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/partitioning/MessageBatcher.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/partitioning/MessageBatcher.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/partitioning/MessagePartitioner.java b/client/onramp/src/main/java/com/hotels/road/client/partitioning/MessagePartitioner.java
index 5872231..dad8ac1 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/partitioning/MessagePartitioner.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/partitioning/MessagePartitioner.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/partitioning/MessageWithCallback.java b/client/onramp/src/main/java/com/hotels/road/client/partitioning/MessageWithCallback.java
index e295dab..132d1b8 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/partitioning/MessageWithCallback.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/partitioning/MessageWithCallback.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/partitioning/PartitionPathSupplier.java b/client/onramp/src/main/java/com/hotels/road/client/partitioning/PartitionPathSupplier.java
index 7753b27..a6d0918 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/partitioning/PartitionPathSupplier.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/partitioning/PartitionPathSupplier.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/partitioning/PartitionerFactory.java b/client/onramp/src/main/java/com/hotels/road/client/partitioning/PartitionerFactory.java
index 26a0927..c4da3f8 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/partitioning/PartitionerFactory.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/partitioning/PartitionerFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/partitioning/PartitioningRoadClientBuilder.java b/client/onramp/src/main/java/com/hotels/road/client/partitioning/PartitioningRoadClientBuilder.java
index 5bd95eb..fd963af 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/partitioning/PartitioningRoadClientBuilder.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/partitioning/PartitioningRoadClientBuilder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/partitioning/ScheduledSupplier.java b/client/onramp/src/main/java/com/hotels/road/client/partitioning/ScheduledSupplier.java
index 4512180..87f2499 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/partitioning/ScheduledSupplier.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/partitioning/ScheduledSupplier.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/simple/OnrampEncodingException.java b/client/onramp/src/main/java/com/hotels/road/client/simple/OnrampEncodingException.java
index 1f077e3..926b50c 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/simple/OnrampEncodingException.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/simple/OnrampEncodingException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/simple/OnrampException.java b/client/onramp/src/main/java/com/hotels/road/client/simple/OnrampException.java
index ff01cee..2ea2270 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/simple/OnrampException.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/simple/OnrampException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/simple/OnrampServerException.java b/client/onramp/src/main/java/com/hotels/road/client/simple/OnrampServerException.java
index 8305090..5e05801 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/simple/OnrampServerException.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/simple/OnrampServerException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/main/java/com/hotels/road/client/simple/SimpleRoadClient.java b/client/onramp/src/main/java/com/hotels/road/client/simple/SimpleRoadClient.java
index 5fd6448..1953690 100644
--- a/client/onramp/src/main/java/com/hotels/road/client/simple/SimpleRoadClient.java
+++ b/client/onramp/src/main/java/com/hotels/road/client/simple/SimpleRoadClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/test/java/com/hotels/road/client/AsyncRoadClientTest.java b/client/onramp/src/test/java/com/hotels/road/client/AsyncRoadClientTest.java
index 110530d..7628050 100644
--- a/client/onramp/src/test/java/com/hotels/road/client/AsyncRoadClientTest.java
+++ b/client/onramp/src/test/java/com/hotels/road/client/AsyncRoadClientTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/test/java/com/hotels/road/client/ExponentialBackoffRetryHandlerTest.java b/client/onramp/src/test/java/com/hotels/road/client/ExponentialBackoffRetryHandlerTest.java
index 6e4a980..8930400 100644
--- a/client/onramp/src/test/java/com/hotels/road/client/ExponentialBackoffRetryHandlerTest.java
+++ b/client/onramp/src/test/java/com/hotels/road/client/ExponentialBackoffRetryHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/test/java/com/hotels/road/client/OnrampOptionsTest.java b/client/onramp/src/test/java/com/hotels/road/client/OnrampOptionsTest.java
index cf078a8..c76e1d7 100644
--- a/client/onramp/src/test/java/com/hotels/road/client/OnrampOptionsTest.java
+++ b/client/onramp/src/test/java/com/hotels/road/client/OnrampOptionsTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/test/java/com/hotels/road/client/OnrampWireMockTest.java b/client/onramp/src/test/java/com/hotels/road/client/OnrampWireMockTest.java
index d859c44..04e9110 100644
--- a/client/onramp/src/test/java/com/hotels/road/client/OnrampWireMockTest.java
+++ b/client/onramp/src/test/java/com/hotels/road/client/OnrampWireMockTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/test/java/com/hotels/road/client/RoadClientTest.java b/client/onramp/src/test/java/com/hotels/road/client/RoadClientTest.java
index 66bec09..d2c162f 100644
--- a/client/onramp/src/test/java/com/hotels/road/client/RoadClientTest.java
+++ b/client/onramp/src/test/java/com/hotels/road/client/RoadClientTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/test/java/com/hotels/road/client/SimpleModel.java b/client/onramp/src/test/java/com/hotels/road/client/SimpleModel.java
index c639a50..24b5e2a 100644
--- a/client/onramp/src/test/java/com/hotels/road/client/SimpleModel.java
+++ b/client/onramp/src/test/java/com/hotels/road/client/SimpleModel.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/test/java/com/hotels/road/client/http/HttpClientConnectionManagerFactoryTest.java b/client/onramp/src/test/java/com/hotels/road/client/http/HttpClientConnectionManagerFactoryTest.java
index 9f38f8b..5a52a46 100644
--- a/client/onramp/src/test/java/com/hotels/road/client/http/HttpClientConnectionManagerFactoryTest.java
+++ b/client/onramp/src/test/java/com/hotels/road/client/http/HttpClientConnectionManagerFactoryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/test/java/com/hotels/road/client/http/HttpHandlerTest.java b/client/onramp/src/test/java/com/hotels/road/client/http/HttpHandlerTest.java
index 89d8eb4..e749104 100644
--- a/client/onramp/src/test/java/com/hotels/road/client/http/HttpHandlerTest.java
+++ b/client/onramp/src/test/java/com/hotels/road/client/http/HttpHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/test/java/com/hotels/road/client/http/RetryHandlerWrapperTest.java b/client/onramp/src/test/java/com/hotels/road/client/http/RetryHandlerWrapperTest.java
index 1b3be78..b7c4638 100644
--- a/client/onramp/src/test/java/com/hotels/road/client/http/RetryHandlerWrapperTest.java
+++ b/client/onramp/src/test/java/com/hotels/road/client/http/RetryHandlerWrapperTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/test/java/com/hotels/road/client/partitioning/DefinitionSupplierTest.java b/client/onramp/src/test/java/com/hotels/road/client/partitioning/DefinitionSupplierTest.java
index d9f7c80..7ecff88 100644
--- a/client/onramp/src/test/java/com/hotels/road/client/partitioning/DefinitionSupplierTest.java
+++ b/client/onramp/src/test/java/com/hotels/road/client/partitioning/DefinitionSupplierTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/test/java/com/hotels/road/client/partitioning/MessageBatcherTest.java b/client/onramp/src/test/java/com/hotels/road/client/partitioning/MessageBatcherTest.java
index 3751ae6..c264c75 100644
--- a/client/onramp/src/test/java/com/hotels/road/client/partitioning/MessageBatcherTest.java
+++ b/client/onramp/src/test/java/com/hotels/road/client/partitioning/MessageBatcherTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/test/java/com/hotels/road/client/partitioning/MessagePartitionerTest.java b/client/onramp/src/test/java/com/hotels/road/client/partitioning/MessagePartitionerTest.java
index d26840b..39802c0 100644
--- a/client/onramp/src/test/java/com/hotels/road/client/partitioning/MessagePartitionerTest.java
+++ b/client/onramp/src/test/java/com/hotels/road/client/partitioning/MessagePartitionerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/test/java/com/hotels/road/client/partitioning/PartitionPathSupplierTest.java b/client/onramp/src/test/java/com/hotels/road/client/partitioning/PartitionPathSupplierTest.java
index 7274501..964bbf6 100644
--- a/client/onramp/src/test/java/com/hotels/road/client/partitioning/PartitionPathSupplierTest.java
+++ b/client/onramp/src/test/java/com/hotels/road/client/partitioning/PartitionPathSupplierTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/test/java/com/hotels/road/client/partitioning/PartitionerFactoryTest.java b/client/onramp/src/test/java/com/hotels/road/client/partitioning/PartitionerFactoryTest.java
index 52c06b2..b39d430 100644
--- a/client/onramp/src/test/java/com/hotels/road/client/partitioning/PartitionerFactoryTest.java
+++ b/client/onramp/src/test/java/com/hotels/road/client/partitioning/PartitionerFactoryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/test/java/com/hotels/road/client/partitioning/PartitioningRoadClientBuilderTest.java b/client/onramp/src/test/java/com/hotels/road/client/partitioning/PartitioningRoadClientBuilderTest.java
index 1f08dc3..b11b5ae 100644
--- a/client/onramp/src/test/java/com/hotels/road/client/partitioning/PartitioningRoadClientBuilderTest.java
+++ b/client/onramp/src/test/java/com/hotels/road/client/partitioning/PartitioningRoadClientBuilderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/test/java/com/hotels/road/client/partitioning/ScheduledSupplierTest.java b/client/onramp/src/test/java/com/hotels/road/client/partitioning/ScheduledSupplierTest.java
index 113e585..79d1105 100644
--- a/client/onramp/src/test/java/com/hotels/road/client/partitioning/ScheduledSupplierTest.java
+++ b/client/onramp/src/test/java/com/hotels/road/client/partitioning/ScheduledSupplierTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/test/java/com/hotels/road/client/simple/SimpleRoadClientTest.java b/client/onramp/src/test/java/com/hotels/road/client/simple/SimpleRoadClientTest.java
index 26df0e2..2624183 100644
--- a/client/onramp/src/test/java/com/hotels/road/client/simple/SimpleRoadClientTest.java
+++ b/client/onramp/src/test/java/com/hotels/road/client/simple/SimpleRoadClientTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/client/onramp/src/test/resources/logback-test.xml b/client/onramp/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/client/onramp/src/test/resources/logback-test.xml
+++ b/client/onramp/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/common/boot/src/main/java/com/hotels/road/boot/DataHighwayApplication.java b/common/boot/src/main/java/com/hotels/road/boot/DataHighwayApplication.java
index 8c84e89..efc7fff 100644
--- a/common/boot/src/main/java/com/hotels/road/boot/DataHighwayApplication.java
+++ b/common/boot/src/main/java/com/hotels/road/boot/DataHighwayApplication.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/controllers/src/main/java/com/hotels/road/rest/controller/common/CommonClockConfiguration.java b/common/controllers/src/main/java/com/hotels/road/rest/controller/common/CommonClockConfiguration.java
index 11a9d4c..a68ba08 100644
--- a/common/controllers/src/main/java/com/hotels/road/rest/controller/common/CommonClockConfiguration.java
+++ b/common/controllers/src/main/java/com/hotels/road/rest/controller/common/CommonClockConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/controllers/src/main/java/com/hotels/road/rest/controller/common/ContentDecompressionFilter.java b/common/controllers/src/main/java/com/hotels/road/rest/controller/common/ContentDecompressionFilter.java
index ae23b14..7665442 100644
--- a/common/controllers/src/main/java/com/hotels/road/rest/controller/common/ContentDecompressionFilter.java
+++ b/common/controllers/src/main/java/com/hotels/road/rest/controller/common/ContentDecompressionFilter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/controllers/src/main/java/com/hotels/road/rest/controller/common/ControllersCommonConfiguration.java b/common/controllers/src/main/java/com/hotels/road/rest/controller/common/ControllersCommonConfiguration.java
index d5cd3fd..f5cc9d6 100644
--- a/common/controllers/src/main/java/com/hotels/road/rest/controller/common/ControllersCommonConfiguration.java
+++ b/common/controllers/src/main/java/com/hotels/road/rest/controller/common/ControllersCommonConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/controllers/src/main/java/com/hotels/road/rest/controller/common/GlobalExceptionHandler.java b/common/controllers/src/main/java/com/hotels/road/rest/controller/common/GlobalExceptionHandler.java
index 9fbe9fe..f342fbe 100644
--- a/common/controllers/src/main/java/com/hotels/road/rest/controller/common/GlobalExceptionHandler.java
+++ b/common/controllers/src/main/java/com/hotels/road/rest/controller/common/GlobalExceptionHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/controllers/src/main/java/com/hotels/road/rest/controller/common/ServletInputStreamWrapper.java b/common/controllers/src/main/java/com/hotels/road/rest/controller/common/ServletInputStreamWrapper.java
index 2175146..5d0edb3 100644
--- a/common/controllers/src/main/java/com/hotels/road/rest/controller/common/ServletInputStreamWrapper.java
+++ b/common/controllers/src/main/java/com/hotels/road/rest/controller/common/ServletInputStreamWrapper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/controllers/src/test/java/com/hotels/road/rest/controller/common/ContentDecompressionFilterTest.java b/common/controllers/src/test/java/com/hotels/road/rest/controller/common/ContentDecompressionFilterTest.java
index 7c21813..08b54b6 100644
--- a/common/controllers/src/test/java/com/hotels/road/rest/controller/common/ContentDecompressionFilterTest.java
+++ b/common/controllers/src/test/java/com/hotels/road/rest/controller/common/ContentDecompressionFilterTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/controllers/src/test/java/com/hotels/road/rest/controller/common/ServletInputStreamWrapperTest.java b/common/controllers/src/test/java/com/hotels/road/rest/controller/common/ServletInputStreamWrapperTest.java
index 92dbc4f..1e5ac9e 100644
--- a/common/controllers/src/test/java/com/hotels/road/rest/controller/common/ServletInputStreamWrapperTest.java
+++ b/common/controllers/src/test/java/com/hotels/road/rest/controller/common/ServletInputStreamWrapperTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/exceptions/src/main/java/com/hotels/road/exception/AlreadyExistsException.java b/common/exceptions/src/main/java/com/hotels/road/exception/AlreadyExistsException.java
index 39cc2e6..c45a54f 100644
--- a/common/exceptions/src/main/java/com/hotels/road/exception/AlreadyExistsException.java
+++ b/common/exceptions/src/main/java/com/hotels/road/exception/AlreadyExistsException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/exceptions/src/main/java/com/hotels/road/exception/InvalidEventException.java b/common/exceptions/src/main/java/com/hotels/road/exception/InvalidEventException.java
index b44ec6d..ad3b982 100644
--- a/common/exceptions/src/main/java/com/hotels/road/exception/InvalidEventException.java
+++ b/common/exceptions/src/main/java/com/hotels/road/exception/InvalidEventException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/exceptions/src/main/java/com/hotels/road/exception/InvalidKeyException.java b/common/exceptions/src/main/java/com/hotels/road/exception/InvalidKeyException.java
index 6b14247..44c6a4e 100644
--- a/common/exceptions/src/main/java/com/hotels/road/exception/InvalidKeyException.java
+++ b/common/exceptions/src/main/java/com/hotels/road/exception/InvalidKeyException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/exceptions/src/main/java/com/hotels/road/exception/InvalidKeyPathException.java b/common/exceptions/src/main/java/com/hotels/road/exception/InvalidKeyPathException.java
index 5152689..0fcd2e0 100644
--- a/common/exceptions/src/main/java/com/hotels/road/exception/InvalidKeyPathException.java
+++ b/common/exceptions/src/main/java/com/hotels/road/exception/InvalidKeyPathException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/exceptions/src/main/java/com/hotels/road/exception/InvalidSchemaException.java b/common/exceptions/src/main/java/com/hotels/road/exception/InvalidSchemaException.java
index 5015a11..74642b3 100644
--- a/common/exceptions/src/main/java/com/hotels/road/exception/InvalidSchemaException.java
+++ b/common/exceptions/src/main/java/com/hotels/road/exception/InvalidSchemaException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/exceptions/src/main/java/com/hotels/road/exception/InvalidSchemaVersionException.java b/common/exceptions/src/main/java/com/hotels/road/exception/InvalidSchemaVersionException.java
index 3439f6d..0271356 100644
--- a/common/exceptions/src/main/java/com/hotels/road/exception/InvalidSchemaVersionException.java
+++ b/common/exceptions/src/main/java/com/hotels/road/exception/InvalidSchemaVersionException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/exceptions/src/main/java/com/hotels/road/exception/RoadUnavailableException.java b/common/exceptions/src/main/java/com/hotels/road/exception/RoadUnavailableException.java
index 4b44508..181ede9 100644
--- a/common/exceptions/src/main/java/com/hotels/road/exception/RoadUnavailableException.java
+++ b/common/exceptions/src/main/java/com/hotels/road/exception/RoadUnavailableException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/exceptions/src/main/java/com/hotels/road/exception/ServiceException.java b/common/exceptions/src/main/java/com/hotels/road/exception/ServiceException.java
index 415af43..825d6ea 100644
--- a/common/exceptions/src/main/java/com/hotels/road/exception/ServiceException.java
+++ b/common/exceptions/src/main/java/com/hotels/road/exception/ServiceException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/exceptions/src/main/java/com/hotels/road/exception/UnknownDestinationException.java b/common/exceptions/src/main/java/com/hotels/road/exception/UnknownDestinationException.java
index 6c3b790..0bcdcde 100644
--- a/common/exceptions/src/main/java/com/hotels/road/exception/UnknownDestinationException.java
+++ b/common/exceptions/src/main/java/com/hotels/road/exception/UnknownDestinationException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/exceptions/src/main/java/com/hotels/road/exception/UnknownRoadException.java b/common/exceptions/src/main/java/com/hotels/road/exception/UnknownRoadException.java
index 91817a7..bd914d2 100644
--- a/common/exceptions/src/main/java/com/hotels/road/exception/UnknownRoadException.java
+++ b/common/exceptions/src/main/java/com/hotels/road/exception/UnknownRoadException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/io/src/main/java/com/hotels/road/io/AbortableOutputStream.java b/common/io/src/main/java/com/hotels/road/io/AbortableOutputStream.java
index 32a94b5..9919c74 100644
--- a/common/io/src/main/java/com/hotels/road/io/AbortableOutputStream.java
+++ b/common/io/src/main/java/com/hotels/road/io/AbortableOutputStream.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/kafka-store/src/main/java/com/hotels/road/kafkastore/KafkaStore.java b/common/kafka-store/src/main/java/com/hotels/road/kafkastore/KafkaStore.java
index adfe1bc..810b9ee 100644
--- a/common/kafka-store/src/main/java/com/hotels/road/kafkastore/KafkaStore.java
+++ b/common/kafka-store/src/main/java/com/hotels/road/kafkastore/KafkaStore.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/kafka-store/src/main/java/com/hotels/road/kafkastore/KafkaStoreUtils.java b/common/kafka-store/src/main/java/com/hotels/road/kafkastore/KafkaStoreUtils.java
index 119c858..5fac04d 100644
--- a/common/kafka-store/src/main/java/com/hotels/road/kafkastore/KafkaStoreUtils.java
+++ b/common/kafka-store/src/main/java/com/hotels/road/kafkastore/KafkaStoreUtils.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/kafka-store/src/main/java/com/hotels/road/kafkastore/StoreUpdateObserver.java b/common/kafka-store/src/main/java/com/hotels/road/kafkastore/StoreUpdateObserver.java
index c9d41c2..50f7df6 100644
--- a/common/kafka-store/src/main/java/com/hotels/road/kafkastore/StoreUpdateObserver.java
+++ b/common/kafka-store/src/main/java/com/hotels/road/kafkastore/StoreUpdateObserver.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/kafka-store/src/main/java/com/hotels/road/kafkastore/exceptions/IgnoreableNoopKeyException.java b/common/kafka-store/src/main/java/com/hotels/road/kafkastore/exceptions/IgnoreableNoopKeyException.java
index e3ab7c8..72b2674 100644
--- a/common/kafka-store/src/main/java/com/hotels/road/kafkastore/exceptions/IgnoreableNoopKeyException.java
+++ b/common/kafka-store/src/main/java/com/hotels/road/kafkastore/exceptions/IgnoreableNoopKeyException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/kafka-store/src/main/java/com/hotels/road/kafkastore/exceptions/SerializationException.java b/common/kafka-store/src/main/java/com/hotels/road/kafkastore/exceptions/SerializationException.java
index 35d3aca..df5eebc 100644
--- a/common/kafka-store/src/main/java/com/hotels/road/kafkastore/exceptions/SerializationException.java
+++ b/common/kafka-store/src/main/java/com/hotels/road/kafkastore/exceptions/SerializationException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/kafka-store/src/main/java/com/hotels/road/kafkastore/serialization/AbstractNullPrefixingSerializer.java b/common/kafka-store/src/main/java/com/hotels/road/kafkastore/serialization/AbstractNullPrefixingSerializer.java
index 8b7f5f9..6b7c6d9 100644
--- a/common/kafka-store/src/main/java/com/hotels/road/kafkastore/serialization/AbstractNullPrefixingSerializer.java
+++ b/common/kafka-store/src/main/java/com/hotels/road/kafkastore/serialization/AbstractNullPrefixingSerializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/kafka-store/src/main/java/com/hotels/road/kafkastore/serialization/Serializer.java b/common/kafka-store/src/main/java/com/hotels/road/kafkastore/serialization/Serializer.java
index 2da38ec..6adf664 100644
--- a/common/kafka-store/src/main/java/com/hotels/road/kafkastore/serialization/Serializer.java
+++ b/common/kafka-store/src/main/java/com/hotels/road/kafkastore/serialization/Serializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/kafka-store/src/main/java/com/hotels/road/kafkastore/serialization/StringSerializer.java b/common/kafka-store/src/main/java/com/hotels/road/kafkastore/serialization/StringSerializer.java
index 81b25f0..53515c2 100644
--- a/common/kafka-store/src/main/java/com/hotels/road/kafkastore/serialization/StringSerializer.java
+++ b/common/kafka-store/src/main/java/com/hotels/road/kafkastore/serialization/StringSerializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/kafka-store/src/test/java/com/hotels/road/kafkastore/KafkaStoreObserverTest.java b/common/kafka-store/src/test/java/com/hotels/road/kafkastore/KafkaStoreObserverTest.java
index 0e9adad..4c11aae 100644
--- a/common/kafka-store/src/test/java/com/hotels/road/kafkastore/KafkaStoreObserverTest.java
+++ b/common/kafka-store/src/test/java/com/hotels/road/kafkastore/KafkaStoreObserverTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/kafka-store/src/test/java/com/hotels/road/kafkastore/KafkaStoreTest.java b/common/kafka-store/src/test/java/com/hotels/road/kafkastore/KafkaStoreTest.java
index 3668c58..70f5ba7 100644
--- a/common/kafka-store/src/test/java/com/hotels/road/kafkastore/KafkaStoreTest.java
+++ b/common/kafka-store/src/test/java/com/hotels/road/kafkastore/KafkaStoreTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/kafka-store/src/test/java/com/hotels/road/kafkastore/KafkaStoreUtilsTest.java b/common/kafka-store/src/test/java/com/hotels/road/kafkastore/KafkaStoreUtilsTest.java
index 8116a93..19d6141 100644
--- a/common/kafka-store/src/test/java/com/hotels/road/kafkastore/KafkaStoreUtilsTest.java
+++ b/common/kafka-store/src/test/java/com/hotels/road/kafkastore/KafkaStoreUtilsTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/kafka-store/src/test/java/com/hotels/road/kafkastore/LegacyNoopRecordTest.java b/common/kafka-store/src/test/java/com/hotels/road/kafkastore/LegacyNoopRecordTest.java
index 5479371..e7d777e 100644
--- a/common/kafka-store/src/test/java/com/hotels/road/kafkastore/LegacyNoopRecordTest.java
+++ b/common/kafka-store/src/test/java/com/hotels/road/kafkastore/LegacyNoopRecordTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/kafka-store/src/test/java/com/hotels/road/kafkastore/serialization/StringSerializerTest.java b/common/kafka-store/src/test/java/com/hotels/road/kafkastore/serialization/StringSerializerTest.java
index ef6768f..0448d8f 100644
--- a/common/kafka-store/src/test/java/com/hotels/road/kafkastore/serialization/StringSerializerTest.java
+++ b/common/kafka-store/src/test/java/com/hotels/road/kafkastore/serialization/StringSerializerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/kafka-store/src/test/resources/logback-test.xml b/common/kafka-store/src/test/resources/logback-test.xml
index 1ae6f0f..314cab4 100644
--- a/common/kafka-store/src/test/resources/logback-test.xml
+++ b/common/kafka-store/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/common/maven-version/src/main/java/com/hotels/road/maven/version/DataHighwayVersion.java b/common/maven-version/src/main/java/com/hotels/road/maven/version/DataHighwayVersion.java
index 6d5b20c..900f546 100644
--- a/common/maven-version/src/main/java/com/hotels/road/maven/version/DataHighwayVersion.java
+++ b/common/maven-version/src/main/java/com/hotels/road/maven/version/DataHighwayVersion.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/maven-version/src/main/java/com/hotels/road/maven/version/MavenVersion.java b/common/maven-version/src/main/java/com/hotels/road/maven/version/MavenVersion.java
index 248c92b..9797dc1 100644
--- a/common/maven-version/src/main/java/com/hotels/road/maven/version/MavenVersion.java
+++ b/common/maven-version/src/main/java/com/hotels/road/maven/version/MavenVersion.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/maven-version/src/test/java/com/hotels/road/maven/version/MavenVersionTest.java b/common/maven-version/src/test/java/com/hotels/road/maven/version/MavenVersionTest.java
index 26feed3..6a3c247 100644
--- a/common/maven-version/src/test/java/com/hotels/road/maven/version/MavenVersionTest.java
+++ b/common/maven-version/src/test/java/com/hotels/road/maven/version/MavenVersionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/maven-version/src/test/resources/logback-test.xml b/common/maven-version/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/common/maven-version/src/test/resources/logback-test.xml
+++ b/common/maven-version/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/common/model/core/src/main/java/com/hotels/road/model/core/Destination.java b/common/model/core/src/main/java/com/hotels/road/model/core/Destination.java
index 3890979..1aaa5d9 100644
--- a/common/model/core/src/main/java/com/hotels/road/model/core/Destination.java
+++ b/common/model/core/src/main/java/com/hotels/road/model/core/Destination.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/core/src/main/java/com/hotels/road/model/core/HiveDestination.java b/common/model/core/src/main/java/com/hotels/road/model/core/HiveDestination.java
index 6394dcb..50f8ae6 100644
--- a/common/model/core/src/main/java/com/hotels/road/model/core/HiveDestination.java
+++ b/common/model/core/src/main/java/com/hotels/road/model/core/HiveDestination.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/core/src/main/java/com/hotels/road/model/core/HiveDestinationStatus.java b/common/model/core/src/main/java/com/hotels/road/model/core/HiveDestinationStatus.java
index d187676..743cf1a 100644
--- a/common/model/core/src/main/java/com/hotels/road/model/core/HiveDestinationStatus.java
+++ b/common/model/core/src/main/java/com/hotels/road/model/core/HiveDestinationStatus.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/core/src/main/java/com/hotels/road/model/core/KafkaStatus.java b/common/model/core/src/main/java/com/hotels/road/model/core/KafkaStatus.java
index c021cbc..5ed9a58 100644
--- a/common/model/core/src/main/java/com/hotels/road/model/core/KafkaStatus.java
+++ b/common/model/core/src/main/java/com/hotels/road/model/core/KafkaStatus.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/core/src/main/java/com/hotels/road/model/core/MessageStatus.java b/common/model/core/src/main/java/com/hotels/road/model/core/MessageStatus.java
index d5ea27d..5a965c5 100644
--- a/common/model/core/src/main/java/com/hotels/road/model/core/MessageStatus.java
+++ b/common/model/core/src/main/java/com/hotels/road/model/core/MessageStatus.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/core/src/main/java/com/hotels/road/model/core/Road.java b/common/model/core/src/main/java/com/hotels/road/model/core/Road.java
index b6cf14c..01c0d43 100644
--- a/common/model/core/src/main/java/com/hotels/road/model/core/Road.java
+++ b/common/model/core/src/main/java/com/hotels/road/model/core/Road.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/core/src/main/java/com/hotels/road/model/core/SchemaVersion.java b/common/model/core/src/main/java/com/hotels/road/model/core/SchemaVersion.java
index 6d20aba..22d6ef6 100644
--- a/common/model/core/src/main/java/com/hotels/road/model/core/SchemaVersion.java
+++ b/common/model/core/src/main/java/com/hotels/road/model/core/SchemaVersion.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/core/src/main/java/com/hotels/road/model/serde/DestinationTypeIdResolver.java b/common/model/core/src/main/java/com/hotels/road/model/serde/DestinationTypeIdResolver.java
index 177aac8..36efd98 100644
--- a/common/model/core/src/main/java/com/hotels/road/model/serde/DestinationTypeIdResolver.java
+++ b/common/model/core/src/main/java/com/hotels/road/model/serde/DestinationTypeIdResolver.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/core/src/main/java/com/hotels/road/model/serde/ObjectMapperFactory.java b/common/model/core/src/main/java/com/hotels/road/model/serde/ObjectMapperFactory.java
index a07cf84..865099c 100644
--- a/common/model/core/src/main/java/com/hotels/road/model/serde/ObjectMapperFactory.java
+++ b/common/model/core/src/main/java/com/hotels/road/model/serde/ObjectMapperFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/core/src/test/java/com/hotels/road/model/core/SchemaVersionTest.java b/common/model/core/src/test/java/com/hotels/road/model/core/SchemaVersionTest.java
index 7c3f155..7b84f27 100644
--- a/common/model/core/src/test/java/com/hotels/road/model/core/SchemaVersionTest.java
+++ b/common/model/core/src/test/java/com/hotels/road/model/core/SchemaVersionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/core/src/test/resources/logback-test.xml b/common/model/core/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/common/model/core/src/test/resources/logback-test.xml
+++ b/common/model/core/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/common/model/kafka/src/main/java/com/hotels/road/model/kafka/RoadModelConfiguration.java b/common/model/kafka/src/main/java/com/hotels/road/model/kafka/RoadModelConfiguration.java
index f77d484..01f8b46 100644
--- a/common/model/kafka/src/main/java/com/hotels/road/model/kafka/RoadModelConfiguration.java
+++ b/common/model/kafka/src/main/java/com/hotels/road/model/kafka/RoadModelConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/kafka/src/main/java/com/hotels/road/model/kafka/RoadReader.java b/common/model/kafka/src/main/java/com/hotels/road/model/kafka/RoadReader.java
index d93a261..6a27792 100644
--- a/common/model/kafka/src/main/java/com/hotels/road/model/kafka/RoadReader.java
+++ b/common/model/kafka/src/main/java/com/hotels/road/model/kafka/RoadReader.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/kafka/src/test/java/com/hotels/road/model/kafka/RoadReaderTest.java b/common/model/kafka/src/test/java/com/hotels/road/model/kafka/RoadReaderTest.java
index 9750412..264344c 100644
--- a/common/model/kafka/src/test/java/com/hotels/road/model/kafka/RoadReaderTest.java
+++ b/common/model/kafka/src/test/java/com/hotels/road/model/kafka/RoadReaderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/kafka/src/test/resources/logback-test.xml b/common/model/kafka/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/common/model/kafka/src/test/resources/logback-test.xml
+++ b/common/model/kafka/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/common/model/rest/src/main/java/com/hotels/road/rest/model/Authorisation.java b/common/model/rest/src/main/java/com/hotels/road/rest/model/Authorisation.java
index 35bf84f..541386d 100644
--- a/common/model/rest/src/main/java/com/hotels/road/rest/model/Authorisation.java
+++ b/common/model/rest/src/main/java/com/hotels/road/rest/model/Authorisation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/rest/src/main/java/com/hotels/road/rest/model/BasicRoadModel.java b/common/model/rest/src/main/java/com/hotels/road/rest/model/BasicRoadModel.java
index 9e39c0a..d5fcab7 100644
--- a/common/model/rest/src/main/java/com/hotels/road/rest/model/BasicRoadModel.java
+++ b/common/model/rest/src/main/java/com/hotels/road/rest/model/BasicRoadModel.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/rest/src/main/java/com/hotels/road/rest/model/HiveDestinationModel.java b/common/model/rest/src/main/java/com/hotels/road/rest/model/HiveDestinationModel.java
index 793165e..555c86e 100644
--- a/common/model/rest/src/main/java/com/hotels/road/rest/model/HiveDestinationModel.java
+++ b/common/model/rest/src/main/java/com/hotels/road/rest/model/HiveDestinationModel.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/rest/src/main/java/com/hotels/road/rest/model/RoadModel.java b/common/model/rest/src/main/java/com/hotels/road/rest/model/RoadModel.java
index 789ba7d..61d9a32 100644
--- a/common/model/rest/src/main/java/com/hotels/road/rest/model/RoadModel.java
+++ b/common/model/rest/src/main/java/com/hotels/road/rest/model/RoadModel.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/rest/src/main/java/com/hotels/road/rest/model/RoadType.java b/common/model/rest/src/main/java/com/hotels/road/rest/model/RoadType.java
index ed78b1d..90ee9a5 100644
--- a/common/model/rest/src/main/java/com/hotels/road/rest/model/RoadType.java
+++ b/common/model/rest/src/main/java/com/hotels/road/rest/model/RoadType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/rest/src/main/java/com/hotels/road/rest/model/Sensitivity.java b/common/model/rest/src/main/java/com/hotels/road/rest/model/Sensitivity.java
index cfb5d2e..470afe2 100644
--- a/common/model/rest/src/main/java/com/hotels/road/rest/model/Sensitivity.java
+++ b/common/model/rest/src/main/java/com/hotels/road/rest/model/Sensitivity.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/rest/src/main/java/com/hotels/road/rest/model/StandardResponse.java b/common/model/rest/src/main/java/com/hotels/road/rest/model/StandardResponse.java
index 9e7d01f..e7058e5 100644
--- a/common/model/rest/src/main/java/com/hotels/road/rest/model/StandardResponse.java
+++ b/common/model/rest/src/main/java/com/hotels/road/rest/model/StandardResponse.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/rest/src/main/java/com/hotels/road/rest/model/validator/InvalidRoadNameException.java b/common/model/rest/src/main/java/com/hotels/road/rest/model/validator/InvalidRoadNameException.java
index 8ff8f44..f5aff43 100644
--- a/common/model/rest/src/main/java/com/hotels/road/rest/model/validator/InvalidRoadNameException.java
+++ b/common/model/rest/src/main/java/com/hotels/road/rest/model/validator/InvalidRoadNameException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/rest/src/main/java/com/hotels/road/rest/model/validator/ModelValidationException.java b/common/model/rest/src/main/java/com/hotels/road/rest/model/validator/ModelValidationException.java
index d3819a5..043b6b2 100644
--- a/common/model/rest/src/main/java/com/hotels/road/rest/model/validator/ModelValidationException.java
+++ b/common/model/rest/src/main/java/com/hotels/road/rest/model/validator/ModelValidationException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/rest/src/main/java/com/hotels/road/rest/model/validator/ModelValidator.java b/common/model/rest/src/main/java/com/hotels/road/rest/model/validator/ModelValidator.java
index f117118..a354bc5 100644
--- a/common/model/rest/src/main/java/com/hotels/road/rest/model/validator/ModelValidator.java
+++ b/common/model/rest/src/main/java/com/hotels/road/rest/model/validator/ModelValidator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/rest/src/main/java/com/hotels/road/rest/model/validator/RoadNameValidator.java b/common/model/rest/src/main/java/com/hotels/road/rest/model/validator/RoadNameValidator.java
index 20a5f0a..e23b715 100644
--- a/common/model/rest/src/main/java/com/hotels/road/rest/model/validator/RoadNameValidator.java
+++ b/common/model/rest/src/main/java/com/hotels/road/rest/model/validator/RoadNameValidator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/rest/src/test/java/com/hotels/road/rest/model/BasicRoadModelTest.java b/common/model/rest/src/test/java/com/hotels/road/rest/model/BasicRoadModelTest.java
index d1b0a4f..5a75758 100644
--- a/common/model/rest/src/test/java/com/hotels/road/rest/model/BasicRoadModelTest.java
+++ b/common/model/rest/src/test/java/com/hotels/road/rest/model/BasicRoadModelTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/rest/src/test/java/com/hotels/road/rest/model/StandardResponseTest.java b/common/model/rest/src/test/java/com/hotels/road/rest/model/StandardResponseTest.java
index 15fa6a3..a2ab3bf 100644
--- a/common/model/rest/src/test/java/com/hotels/road/rest/model/StandardResponseTest.java
+++ b/common/model/rest/src/test/java/com/hotels/road/rest/model/StandardResponseTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/rest/src/test/java/com/hotels/road/rest/model/validator/RoadNameValidatorTest.java b/common/model/rest/src/test/java/com/hotels/road/rest/model/validator/RoadNameValidatorTest.java
index a517432..22d463b 100644
--- a/common/model/rest/src/test/java/com/hotels/road/rest/model/validator/RoadNameValidatorTest.java
+++ b/common/model/rest/src/test/java/com/hotels/road/rest/model/validator/RoadNameValidatorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/model/rest/src/test/resources/logback-test.xml b/common/model/rest/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/common/model/rest/src/test/resources/logback-test.xml
+++ b/common/model/rest/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/common/notifications/core/src/main/java/com/hotels/road/notification/NotificationConfiguration.java b/common/notifications/core/src/main/java/com/hotels/road/notification/NotificationConfiguration.java
index 7caf418..f59ff2a 100644
--- a/common/notifications/core/src/main/java/com/hotels/road/notification/NotificationConfiguration.java
+++ b/common/notifications/core/src/main/java/com/hotels/road/notification/NotificationConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/notifications/core/src/main/java/com/hotels/road/notification/NotificationHandler.java b/common/notifications/core/src/main/java/com/hotels/road/notification/NotificationHandler.java
index a567c5b..fabc528 100644
--- a/common/notifications/core/src/main/java/com/hotels/road/notification/NotificationHandler.java
+++ b/common/notifications/core/src/main/java/com/hotels/road/notification/NotificationHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/notifications/core/src/main/java/com/hotels/road/notification/NotificationSender.java b/common/notifications/core/src/main/java/com/hotels/road/notification/NotificationSender.java
index e79fd79..8063df7 100644
--- a/common/notifications/core/src/main/java/com/hotels/road/notification/NotificationSender.java
+++ b/common/notifications/core/src/main/java/com/hotels/road/notification/NotificationSender.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/notifications/core/src/main/java/com/hotels/road/notification/model/DataHighwayNotification.java b/common/notifications/core/src/main/java/com/hotels/road/notification/model/DataHighwayNotification.java
index 5711a90..b4a1b39 100644
--- a/common/notifications/core/src/main/java/com/hotels/road/notification/model/DataHighwayNotification.java
+++ b/common/notifications/core/src/main/java/com/hotels/road/notification/model/DataHighwayNotification.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/notifications/core/src/main/java/com/hotels/road/notification/model/HivePartitionCreated.java b/common/notifications/core/src/main/java/com/hotels/road/notification/model/HivePartitionCreated.java
index 2535127..c48aeb9 100644
--- a/common/notifications/core/src/main/java/com/hotels/road/notification/model/HivePartitionCreated.java
+++ b/common/notifications/core/src/main/java/com/hotels/road/notification/model/HivePartitionCreated.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/notifications/core/src/main/java/com/hotels/road/notification/model/HiveTableCreated.java b/common/notifications/core/src/main/java/com/hotels/road/notification/model/HiveTableCreated.java
index 7ecc261..aec42ea 100644
--- a/common/notifications/core/src/main/java/com/hotels/road/notification/model/HiveTableCreated.java
+++ b/common/notifications/core/src/main/java/com/hotels/road/notification/model/HiveTableCreated.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/notifications/core/src/main/java/com/hotels/road/notification/model/RoadCreatedNotification.java b/common/notifications/core/src/main/java/com/hotels/road/notification/model/RoadCreatedNotification.java
index 97c219c..25a2427 100644
--- a/common/notifications/core/src/main/java/com/hotels/road/notification/model/RoadCreatedNotification.java
+++ b/common/notifications/core/src/main/java/com/hotels/road/notification/model/RoadCreatedNotification.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/notifications/core/src/main/java/com/hotels/road/notification/model/SchemaVersionAdded.java b/common/notifications/core/src/main/java/com/hotels/road/notification/model/SchemaVersionAdded.java
index a5d7280..6b1c4da 100644
--- a/common/notifications/core/src/main/java/com/hotels/road/notification/model/SchemaVersionAdded.java
+++ b/common/notifications/core/src/main/java/com/hotels/road/notification/model/SchemaVersionAdded.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/notifications/core/src/main/java/com/hotels/road/notification/model/SchemaVersionDeleted.java b/common/notifications/core/src/main/java/com/hotels/road/notification/model/SchemaVersionDeleted.java
index c612c1a..b52b64e 100644
--- a/common/notifications/core/src/main/java/com/hotels/road/notification/model/SchemaVersionDeleted.java
+++ b/common/notifications/core/src/main/java/com/hotels/road/notification/model/SchemaVersionDeleted.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/notifications/core/src/test/java/com/hotels/road/notification/CompositeNotificationHandlerTest.java b/common/notifications/core/src/test/java/com/hotels/road/notification/CompositeNotificationHandlerTest.java
index 792376c..64cdac6 100644
--- a/common/notifications/core/src/test/java/com/hotels/road/notification/CompositeNotificationHandlerTest.java
+++ b/common/notifications/core/src/test/java/com/hotels/road/notification/CompositeNotificationHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/notifications/core/src/test/resources/logback-test.xml b/common/notifications/core/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/common/notifications/core/src/test/resources/logback-test.xml
+++ b/common/notifications/core/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/common/notifications/sns/src/main/java/com/hotels/road/notification/sns/SnsNotificationSender.java b/common/notifications/sns/src/main/java/com/hotels/road/notification/sns/SnsNotificationSender.java
index 8a05f6d..dc08dc8 100644
--- a/common/notifications/sns/src/main/java/com/hotels/road/notification/sns/SnsNotificationSender.java
+++ b/common/notifications/sns/src/main/java/com/hotels/road/notification/sns/SnsNotificationSender.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/notifications/sns/src/main/java/com/hotels/road/notification/sns/config/SnsConfiguration.java b/common/notifications/sns/src/main/java/com/hotels/road/notification/sns/config/SnsConfiguration.java
index b7e1aff..cfbdf20 100644
--- a/common/notifications/sns/src/main/java/com/hotels/road/notification/sns/config/SnsConfiguration.java
+++ b/common/notifications/sns/src/main/java/com/hotels/road/notification/sns/config/SnsConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/notifications/sns/src/test/java/com/hotels/road/notification/sns/SnsNotificationSenderTest.java b/common/notifications/sns/src/test/java/com/hotels/road/notification/sns/SnsNotificationSenderTest.java
index 4113b7b..821ada2 100644
--- a/common/notifications/sns/src/test/java/com/hotels/road/notification/sns/SnsNotificationSenderTest.java
+++ b/common/notifications/sns/src/test/java/com/hotels/road/notification/sns/SnsNotificationSenderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/notifications/sns/src/test/resources/logback-test.xml b/common/notifications/sns/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/common/notifications/sns/src/test/resources/logback-test.xml
+++ b/common/notifications/sns/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/common/partition/src/main/java/com/hotels/road/partition/JsonNodeHashCodeFunction.java b/common/partition/src/main/java/com/hotels/road/partition/JsonNodeHashCodeFunction.java
index 0948de1..10e9e1e 100644
--- a/common/partition/src/main/java/com/hotels/road/partition/JsonNodeHashCodeFunction.java
+++ b/common/partition/src/main/java/com/hotels/road/partition/JsonNodeHashCodeFunction.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/partition/src/main/java/com/hotels/road/partition/KeyPathParser.java b/common/partition/src/main/java/com/hotels/road/partition/KeyPathParser.java
index de96a16..9f06949 100644
--- a/common/partition/src/main/java/com/hotels/road/partition/KeyPathParser.java
+++ b/common/partition/src/main/java/com/hotels/road/partition/KeyPathParser.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/partition/src/main/java/com/hotels/road/partition/KeyPathValidator.java b/common/partition/src/main/java/com/hotels/road/partition/KeyPathValidator.java
index 8ec88ba..d73df7e 100644
--- a/common/partition/src/main/java/com/hotels/road/partition/KeyPathValidator.java
+++ b/common/partition/src/main/java/com/hotels/road/partition/KeyPathValidator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/partition/src/main/java/com/hotels/road/partition/MessageHashCodeFunctionSupplier.java b/common/partition/src/main/java/com/hotels/road/partition/MessageHashCodeFunctionSupplier.java
index c859ee1..779839f 100644
--- a/common/partition/src/main/java/com/hotels/road/partition/MessageHashCodeFunctionSupplier.java
+++ b/common/partition/src/main/java/com/hotels/road/partition/MessageHashCodeFunctionSupplier.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/partition/src/main/java/com/hotels/road/partition/PartitionNodeFunction.java b/common/partition/src/main/java/com/hotels/road/partition/PartitionNodeFunction.java
index 1272e47..0a837ac 100644
--- a/common/partition/src/main/java/com/hotels/road/partition/PartitionNodeFunction.java
+++ b/common/partition/src/main/java/com/hotels/road/partition/PartitionNodeFunction.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/partition/src/test/java/com/hotels/road/partition/JsonNodeHashCodeFunctionTest.java b/common/partition/src/test/java/com/hotels/road/partition/JsonNodeHashCodeFunctionTest.java
index 76546f1..98fb0cf 100644
--- a/common/partition/src/test/java/com/hotels/road/partition/JsonNodeHashCodeFunctionTest.java
+++ b/common/partition/src/test/java/com/hotels/road/partition/JsonNodeHashCodeFunctionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/partition/src/test/java/com/hotels/road/partition/KeyPathParserTest.java b/common/partition/src/test/java/com/hotels/road/partition/KeyPathParserTest.java
index a90cfa7..95f15b1 100644
--- a/common/partition/src/test/java/com/hotels/road/partition/KeyPathParserTest.java
+++ b/common/partition/src/test/java/com/hotels/road/partition/KeyPathParserTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/partition/src/test/java/com/hotels/road/partition/KeyPathValidatorTest.java b/common/partition/src/test/java/com/hotels/road/partition/KeyPathValidatorTest.java
index 4ea5803..d7e90e7 100644
--- a/common/partition/src/test/java/com/hotels/road/partition/KeyPathValidatorTest.java
+++ b/common/partition/src/test/java/com/hotels/road/partition/KeyPathValidatorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/partition/src/test/java/com/hotels/road/partition/MessageHashCodeFunctionSupplierTest.java b/common/partition/src/test/java/com/hotels/road/partition/MessageHashCodeFunctionSupplierTest.java
index e20e53f..9a3f629 100644
--- a/common/partition/src/test/java/com/hotels/road/partition/MessageHashCodeFunctionSupplierTest.java
+++ b/common/partition/src/test/java/com/hotels/road/partition/MessageHashCodeFunctionSupplierTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/partition/src/test/java/com/hotels/road/partition/PartitionNodeFunctionTest.java b/common/partition/src/test/java/com/hotels/road/partition/PartitionNodeFunctionTest.java
index 70db05d..6f9aaa4 100644
--- a/common/partition/src/test/java/com/hotels/road/partition/PartitionNodeFunctionTest.java
+++ b/common/partition/src/test/java/com/hotels/road/partition/PartitionNodeFunctionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/partition/src/test/resources/logback-test.xml b/common/partition/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/common/partition/src/test/resources/logback-test.xml
+++ b/common/partition/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/common/pii/src/main/java/com/hotels/road/pii/DefaultPiiReplacer.java b/common/pii/src/main/java/com/hotels/road/pii/DefaultPiiReplacer.java
index ab17864..2a06c74 100644
--- a/common/pii/src/main/java/com/hotels/road/pii/DefaultPiiReplacer.java
+++ b/common/pii/src/main/java/com/hotels/road/pii/DefaultPiiReplacer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/pii/src/main/java/com/hotels/road/pii/PiiReplacer.java b/common/pii/src/main/java/com/hotels/road/pii/PiiReplacer.java
index 5107c4f..3d74840 100644
--- a/common/pii/src/main/java/com/hotels/road/pii/PiiReplacer.java
+++ b/common/pii/src/main/java/com/hotels/road/pii/PiiReplacer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/pii/src/main/java/com/hotels/road/pii/PiiReplacerConfiguration.java b/common/pii/src/main/java/com/hotels/road/pii/PiiReplacerConfiguration.java
index e1ad4a1..666a911 100644
--- a/common/pii/src/main/java/com/hotels/road/pii/PiiReplacerConfiguration.java
+++ b/common/pii/src/main/java/com/hotels/road/pii/PiiReplacerConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/pii/src/test/java/com/hotels/road/pii/DefaultPiiReplacerTest.java b/common/pii/src/test/java/com/hotels/road/pii/DefaultPiiReplacerTest.java
index c622995..7455610 100644
--- a/common/pii/src/test/java/com/hotels/road/pii/DefaultPiiReplacerTest.java
+++ b/common/pii/src/test/java/com/hotels/road/pii/DefaultPiiReplacerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/pii/src/test/java/com/hotels/road/pii/PiiReplacerConfigurationTest.java b/common/pii/src/test/java/com/hotels/road/pii/PiiReplacerConfigurationTest.java
index c294329..abfe633 100644
--- a/common/pii/src/test/java/com/hotels/road/pii/PiiReplacerConfigurationTest.java
+++ b/common/pii/src/test/java/com/hotels/road/pii/PiiReplacerConfigurationTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/s3/src/main/java/com/hotels/road/s3/io/AsyncHandler.java b/common/s3/src/main/java/com/hotels/road/s3/io/AsyncHandler.java
index b57068c..045eb2c 100644
--- a/common/s3/src/main/java/com/hotels/road/s3/io/AsyncHandler.java
+++ b/common/s3/src/main/java/com/hotels/road/s3/io/AsyncHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/s3/src/main/java/com/hotels/road/s3/io/BlockingExecutor.java b/common/s3/src/main/java/com/hotels/road/s3/io/BlockingExecutor.java
index 1b95afa..4163578 100644
--- a/common/s3/src/main/java/com/hotels/road/s3/io/BlockingExecutor.java
+++ b/common/s3/src/main/java/com/hotels/road/s3/io/BlockingExecutor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/s3/src/main/java/com/hotels/road/s3/io/S3ConnectivityCheck.java b/common/s3/src/main/java/com/hotels/road/s3/io/S3ConnectivityCheck.java
index 12acd03..2f3782d 100644
--- a/common/s3/src/main/java/com/hotels/road/s3/io/S3ConnectivityCheck.java
+++ b/common/s3/src/main/java/com/hotels/road/s3/io/S3ConnectivityCheck.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/s3/src/main/java/com/hotels/road/s3/io/S3MultipartOutputStream.java b/common/s3/src/main/java/com/hotels/road/s3/io/S3MultipartOutputStream.java
index 4774b5a..263a180 100644
--- a/common/s3/src/main/java/com/hotels/road/s3/io/S3MultipartOutputStream.java
+++ b/common/s3/src/main/java/com/hotels/road/s3/io/S3MultipartOutputStream.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/s3/src/main/java/com/hotels/road/s3/io/S3MultipartOutputStreamBuilder.java b/common/s3/src/main/java/com/hotels/road/s3/io/S3MultipartOutputStreamBuilder.java
index 2c8f24b..6609604 100644
--- a/common/s3/src/main/java/com/hotels/road/s3/io/S3MultipartOutputStreamBuilder.java
+++ b/common/s3/src/main/java/com/hotels/road/s3/io/S3MultipartOutputStreamBuilder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/s3/src/main/java/com/hotels/road/s3/io/S3MultipartUpload.java b/common/s3/src/main/java/com/hotels/road/s3/io/S3MultipartUpload.java
index ce0fad2..3fac6b2 100644
--- a/common/s3/src/main/java/com/hotels/road/s3/io/S3MultipartUpload.java
+++ b/common/s3/src/main/java/com/hotels/road/s3/io/S3MultipartUpload.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/s3/src/main/java/com/hotels/road/s3/io/S3Part.java b/common/s3/src/main/java/com/hotels/road/s3/io/S3Part.java
index 887b0b2..fbbc676 100644
--- a/common/s3/src/main/java/com/hotels/road/s3/io/S3Part.java
+++ b/common/s3/src/main/java/com/hotels/road/s3/io/S3Part.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/s3/src/main/java/com/hotels/road/s3/io/S3PartOutputStream.java b/common/s3/src/main/java/com/hotels/road/s3/io/S3PartOutputStream.java
index b398475..0d61a19 100644
--- a/common/s3/src/main/java/com/hotels/road/s3/io/S3PartOutputStream.java
+++ b/common/s3/src/main/java/com/hotels/road/s3/io/S3PartOutputStream.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/s3/src/main/java/com/hotels/road/s3/io/package-info.java b/common/s3/src/main/java/com/hotels/road/s3/io/package-info.java
index 9d33190..4ba0401 100644
--- a/common/s3/src/main/java/com/hotels/road/s3/io/package-info.java
+++ b/common/s3/src/main/java/com/hotels/road/s3/io/package-info.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/s3/src/test/java/com/hotels/road/s3/io/AsyncHandlerTest.java b/common/s3/src/test/java/com/hotels/road/s3/io/AsyncHandlerTest.java
index 8248631..7981f01 100644
--- a/common/s3/src/test/java/com/hotels/road/s3/io/AsyncHandlerTest.java
+++ b/common/s3/src/test/java/com/hotels/road/s3/io/AsyncHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/s3/src/test/java/com/hotels/road/s3/io/BlockingExecutorTest.java b/common/s3/src/test/java/com/hotels/road/s3/io/BlockingExecutorTest.java
index 2880685..9494614 100644
--- a/common/s3/src/test/java/com/hotels/road/s3/io/BlockingExecutorTest.java
+++ b/common/s3/src/test/java/com/hotels/road/s3/io/BlockingExecutorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/s3/src/test/java/com/hotels/road/s3/io/S3ConnectivityCheckTest.java b/common/s3/src/test/java/com/hotels/road/s3/io/S3ConnectivityCheckTest.java
index 9ef4e89..c4e9c85 100644
--- a/common/s3/src/test/java/com/hotels/road/s3/io/S3ConnectivityCheckTest.java
+++ b/common/s3/src/test/java/com/hotels/road/s3/io/S3ConnectivityCheckTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/s3/src/test/java/com/hotels/road/s3/io/S3MultipartOutputStreamBuilderTest.java b/common/s3/src/test/java/com/hotels/road/s3/io/S3MultipartOutputStreamBuilderTest.java
index 98bc7a3..49c7892 100644
--- a/common/s3/src/test/java/com/hotels/road/s3/io/S3MultipartOutputStreamBuilderTest.java
+++ b/common/s3/src/test/java/com/hotels/road/s3/io/S3MultipartOutputStreamBuilderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/s3/src/test/java/com/hotels/road/s3/io/S3MultipartOutputStreamTest.java b/common/s3/src/test/java/com/hotels/road/s3/io/S3MultipartOutputStreamTest.java
index a82a27c..a2375db 100644
--- a/common/s3/src/test/java/com/hotels/road/s3/io/S3MultipartOutputStreamTest.java
+++ b/common/s3/src/test/java/com/hotels/road/s3/io/S3MultipartOutputStreamTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/s3/src/test/java/com/hotels/road/s3/io/S3MultipartUploadTest.java b/common/s3/src/test/java/com/hotels/road/s3/io/S3MultipartUploadTest.java
index ce733f2..adfb4bb 100644
--- a/common/s3/src/test/java/com/hotels/road/s3/io/S3MultipartUploadTest.java
+++ b/common/s3/src/test/java/com/hotels/road/s3/io/S3MultipartUploadTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/s3/src/test/java/com/hotels/road/s3/io/S3PartOutputStreamTest.java b/common/s3/src/test/java/com/hotels/road/s3/io/S3PartOutputStreamTest.java
index 2d34670..ece3b81 100644
--- a/common/s3/src/test/java/com/hotels/road/s3/io/S3PartOutputStreamTest.java
+++ b/common/s3/src/test/java/com/hotels/road/s3/io/S3PartOutputStreamTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/s3/src/test/resources/logback-test.xml b/common/s3/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/common/s3/src/test/resources/logback-test.xml
+++ b/common/s3/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/common/schema/src/main/java/com/hotels/road/schema/SchemaTraverser.java b/common/schema/src/main/java/com/hotels/road/schema/SchemaTraverser.java
index a932784..21c7beb 100644
--- a/common/schema/src/main/java/com/hotels/road/schema/SchemaTraverser.java
+++ b/common/schema/src/main/java/com/hotels/road/schema/SchemaTraverser.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/main/java/com/hotels/road/schema/chronology/SchemaChronology.java b/common/schema/src/main/java/com/hotels/road/schema/chronology/SchemaChronology.java
index fba69f9..57ae676 100644
--- a/common/schema/src/main/java/com/hotels/road/schema/chronology/SchemaChronology.java
+++ b/common/schema/src/main/java/com/hotels/road/schema/chronology/SchemaChronology.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/main/java/com/hotels/road/schema/chronology/SchemaCompatibility.java b/common/schema/src/main/java/com/hotels/road/schema/chronology/SchemaCompatibility.java
index b6c7124..b35dfab 100644
--- a/common/schema/src/main/java/com/hotels/road/schema/chronology/SchemaCompatibility.java
+++ b/common/schema/src/main/java/com/hotels/road/schema/chronology/SchemaCompatibility.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/main/java/com/hotels/road/schema/chronology/SchemaCompatibilityException.java b/common/schema/src/main/java/com/hotels/road/schema/chronology/SchemaCompatibilityException.java
index 0eff861..1e3e47b 100644
--- a/common/schema/src/main/java/com/hotels/road/schema/chronology/SchemaCompatibilityException.java
+++ b/common/schema/src/main/java/com/hotels/road/schema/chronology/SchemaCompatibilityException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/main/java/com/hotels/road/schema/gdpr/InvalidPiiAnnotationException.java b/common/schema/src/main/java/com/hotels/road/schema/gdpr/InvalidPiiAnnotationException.java
index 72a03fe..b6a7b6d 100644
--- a/common/schema/src/main/java/com/hotels/road/schema/gdpr/InvalidPiiAnnotationException.java
+++ b/common/schema/src/main/java/com/hotels/road/schema/gdpr/InvalidPiiAnnotationException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/main/java/com/hotels/road/schema/gdpr/PiiLogicalTypeVisitor.java b/common/schema/src/main/java/com/hotels/road/schema/gdpr/PiiLogicalTypeVisitor.java
index 6d2b4e1..19f9128 100644
--- a/common/schema/src/main/java/com/hotels/road/schema/gdpr/PiiLogicalTypeVisitor.java
+++ b/common/schema/src/main/java/com/hotels/road/schema/gdpr/PiiLogicalTypeVisitor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/main/java/com/hotels/road/schema/gdpr/PiiPathVisitor.java b/common/schema/src/main/java/com/hotels/road/schema/gdpr/PiiPathVisitor.java
index 8ac1e32..e338919 100644
--- a/common/schema/src/main/java/com/hotels/road/schema/gdpr/PiiPathVisitor.java
+++ b/common/schema/src/main/java/com/hotels/road/schema/gdpr/PiiPathVisitor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/main/java/com/hotels/road/schema/gdpr/PiiSchemaEvolutionValidator.java b/common/schema/src/main/java/com/hotels/road/schema/gdpr/PiiSchemaEvolutionValidator.java
index fd50ac4..081b20f 100644
--- a/common/schema/src/main/java/com/hotels/road/schema/gdpr/PiiSchemaEvolutionValidator.java
+++ b/common/schema/src/main/java/com/hotels/road/schema/gdpr/PiiSchemaEvolutionValidator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/main/java/com/hotels/road/schema/gdpr/PiiVisitor.java b/common/schema/src/main/java/com/hotels/road/schema/gdpr/PiiVisitor.java
index c2d5771..7d6baea 100644
--- a/common/schema/src/main/java/com/hotels/road/schema/gdpr/PiiVisitor.java
+++ b/common/schema/src/main/java/com/hotels/road/schema/gdpr/PiiVisitor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/main/java/com/hotels/road/schema/serde/SchemaDeserializer.java b/common/schema/src/main/java/com/hotels/road/schema/serde/SchemaDeserializer.java
index d2f64c3..3ef16b2 100644
--- a/common/schema/src/main/java/com/hotels/road/schema/serde/SchemaDeserializer.java
+++ b/common/schema/src/main/java/com/hotels/road/schema/serde/SchemaDeserializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/main/java/com/hotels/road/schema/serde/SchemaSerializationModule.java b/common/schema/src/main/java/com/hotels/road/schema/serde/SchemaSerializationModule.java
index eb45915..9bc4e72 100644
--- a/common/schema/src/main/java/com/hotels/road/schema/serde/SchemaSerializationModule.java
+++ b/common/schema/src/main/java/com/hotels/road/schema/serde/SchemaSerializationModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/main/java/com/hotels/road/schema/serde/SchemaSerializer.java b/common/schema/src/main/java/com/hotels/road/schema/serde/SchemaSerializer.java
index 018e5dc..b4c89fc 100644
--- a/common/schema/src/main/java/com/hotels/road/schema/serde/SchemaSerializer.java
+++ b/common/schema/src/main/java/com/hotels/road/schema/serde/SchemaSerializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/main/java/com/hotels/road/schema/validation/DataHighwaySchemaValidator.java b/common/schema/src/main/java/com/hotels/road/schema/validation/DataHighwaySchemaValidator.java
index 60e3082..fae4864 100644
--- a/common/schema/src/main/java/com/hotels/road/schema/validation/DataHighwaySchemaValidator.java
+++ b/common/schema/src/main/java/com/hotels/road/schema/validation/DataHighwaySchemaValidator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/main/java/com/hotels/road/schema/validation/LogicalTypeValidatingVisitor.java b/common/schema/src/main/java/com/hotels/road/schema/validation/LogicalTypeValidatingVisitor.java
index 6df400b..47c9884 100644
--- a/common/schema/src/main/java/com/hotels/road/schema/validation/LogicalTypeValidatingVisitor.java
+++ b/common/schema/src/main/java/com/hotels/road/schema/validation/LogicalTypeValidatingVisitor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/main/java/com/hotels/road/schema/validation/NonNullableUnionValidatingVisitor.java b/common/schema/src/main/java/com/hotels/road/schema/validation/NonNullableUnionValidatingVisitor.java
index 3f6dfd4..0a11de0 100644
--- a/common/schema/src/main/java/com/hotels/road/schema/validation/NonNullableUnionValidatingVisitor.java
+++ b/common/schema/src/main/java/com/hotels/road/schema/validation/NonNullableUnionValidatingVisitor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/test/java/com/hotels/road/schema/chronology/SchemaCompatibilityTest.java b/common/schema/src/test/java/com/hotels/road/schema/chronology/SchemaCompatibilityTest.java
index 6fc62ba..533b9bc 100644
--- a/common/schema/src/test/java/com/hotels/road/schema/chronology/SchemaCompatibilityTest.java
+++ b/common/schema/src/test/java/com/hotels/road/schema/chronology/SchemaCompatibilityTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/test/java/com/hotels/road/schema/chronology/SchemaTraverserTest.java b/common/schema/src/test/java/com/hotels/road/schema/chronology/SchemaTraverserTest.java
index 6ce006b..bb00646 100644
--- a/common/schema/src/test/java/com/hotels/road/schema/chronology/SchemaTraverserTest.java
+++ b/common/schema/src/test/java/com/hotels/road/schema/chronology/SchemaTraverserTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/test/java/com/hotels/road/schema/gdpr/PiiLogicalTypeVisitorTest.java b/common/schema/src/test/java/com/hotels/road/schema/gdpr/PiiLogicalTypeVisitorTest.java
index ed96050..d5f220b 100644
--- a/common/schema/src/test/java/com/hotels/road/schema/gdpr/PiiLogicalTypeVisitorTest.java
+++ b/common/schema/src/test/java/com/hotels/road/schema/gdpr/PiiLogicalTypeVisitorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/test/java/com/hotels/road/schema/gdpr/PiiPathVisitorTest.java b/common/schema/src/test/java/com/hotels/road/schema/gdpr/PiiPathVisitorTest.java
index 48ac8d2..86a077d 100644
--- a/common/schema/src/test/java/com/hotels/road/schema/gdpr/PiiPathVisitorTest.java
+++ b/common/schema/src/test/java/com/hotels/road/schema/gdpr/PiiPathVisitorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/test/java/com/hotels/road/schema/gdpr/PiiSchemaEvolutionValidatorTest.java b/common/schema/src/test/java/com/hotels/road/schema/gdpr/PiiSchemaEvolutionValidatorTest.java
index 51bcbe7..53d6978 100644
--- a/common/schema/src/test/java/com/hotels/road/schema/gdpr/PiiSchemaEvolutionValidatorTest.java
+++ b/common/schema/src/test/java/com/hotels/road/schema/gdpr/PiiSchemaEvolutionValidatorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/test/java/com/hotels/road/schema/gdpr/PiiVisitorTest.java b/common/schema/src/test/java/com/hotels/road/schema/gdpr/PiiVisitorTest.java
index 52c1fcf..623d023 100644
--- a/common/schema/src/test/java/com/hotels/road/schema/gdpr/PiiVisitorTest.java
+++ b/common/schema/src/test/java/com/hotels/road/schema/gdpr/PiiVisitorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/test/java/com/hotels/road/schema/serde/SchemaDeserializerTest.java b/common/schema/src/test/java/com/hotels/road/schema/serde/SchemaDeserializerTest.java
index 8ffd3f4..17271de 100644
--- a/common/schema/src/test/java/com/hotels/road/schema/serde/SchemaDeserializerTest.java
+++ b/common/schema/src/test/java/com/hotels/road/schema/serde/SchemaDeserializerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/test/java/com/hotels/road/schema/serde/SchemaSerializationModuleTest.java b/common/schema/src/test/java/com/hotels/road/schema/serde/SchemaSerializationModuleTest.java
index afa11a7..b11f476 100644
--- a/common/schema/src/test/java/com/hotels/road/schema/serde/SchemaSerializationModuleTest.java
+++ b/common/schema/src/test/java/com/hotels/road/schema/serde/SchemaSerializationModuleTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/test/java/com/hotels/road/schema/serde/SchemaSerializerTest.java b/common/schema/src/test/java/com/hotels/road/schema/serde/SchemaSerializerTest.java
index 9e7420d..d88ec30 100644
--- a/common/schema/src/test/java/com/hotels/road/schema/serde/SchemaSerializerTest.java
+++ b/common/schema/src/test/java/com/hotels/road/schema/serde/SchemaSerializerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/test/java/com/hotels/road/schema/validation/DataHighwaySchemaValidatorTest.java b/common/schema/src/test/java/com/hotels/road/schema/validation/DataHighwaySchemaValidatorTest.java
index 1b30fd9..979d062 100644
--- a/common/schema/src/test/java/com/hotels/road/schema/validation/DataHighwaySchemaValidatorTest.java
+++ b/common/schema/src/test/java/com/hotels/road/schema/validation/DataHighwaySchemaValidatorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/test/java/com/hotels/road/schema/validation/LogicalTypeValidatingVisitorTest.java b/common/schema/src/test/java/com/hotels/road/schema/validation/LogicalTypeValidatingVisitorTest.java
index 3f49c98..57c7139 100644
--- a/common/schema/src/test/java/com/hotels/road/schema/validation/LogicalTypeValidatingVisitorTest.java
+++ b/common/schema/src/test/java/com/hotels/road/schema/validation/LogicalTypeValidatingVisitorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/test/java/com/hotels/road/schema/validation/NonNullableUnionValidatingVisitorTest.java b/common/schema/src/test/java/com/hotels/road/schema/validation/NonNullableUnionValidatingVisitorTest.java
index 622d0b5..6d3e931 100644
--- a/common/schema/src/test/java/com/hotels/road/schema/validation/NonNullableUnionValidatingVisitorTest.java
+++ b/common/schema/src/test/java/com/hotels/road/schema/validation/NonNullableUnionValidatingVisitorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/schema/src/test/resources/logback-test.xml b/common/schema/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/common/schema/src/test/resources/logback-test.xml
+++ b/common/schema/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/common/security/src/main/java/com/hotels/road/security/AuthenticationType.java b/common/security/src/main/java/com/hotels/road/security/AuthenticationType.java
index 22ed344..3d3c236 100644
--- a/common/security/src/main/java/com/hotels/road/security/AuthenticationType.java
+++ b/common/security/src/main/java/com/hotels/road/security/AuthenticationType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/security/src/main/java/com/hotels/road/security/AuthorisationOutcome.java b/common/security/src/main/java/com/hotels/road/security/AuthorisationOutcome.java
index 9ab69b9..8f5a63e 100644
--- a/common/security/src/main/java/com/hotels/road/security/AuthorisationOutcome.java
+++ b/common/security/src/main/java/com/hotels/road/security/AuthorisationOutcome.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/security/src/main/java/com/hotels/road/security/CidrBlockAuthorisation.java b/common/security/src/main/java/com/hotels/road/security/CidrBlockAuthorisation.java
index fa1947f..e8fc741 100644
--- a/common/security/src/main/java/com/hotels/road/security/CidrBlockAuthorisation.java
+++ b/common/security/src/main/java/com/hotels/road/security/CidrBlockAuthorisation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/security/src/main/java/com/hotels/road/security/CidrBlockValidator.java b/common/security/src/main/java/com/hotels/road/security/CidrBlockValidator.java
index 803ec34..c380093 100644
--- a/common/security/src/main/java/com/hotels/road/security/CidrBlockValidator.java
+++ b/common/security/src/main/java/com/hotels/road/security/CidrBlockValidator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/security/src/main/java/com/hotels/road/security/CidrSecurityConfiguration.java b/common/security/src/main/java/com/hotels/road/security/CidrSecurityConfiguration.java
index 4171f49..31e31c8 100644
--- a/common/security/src/main/java/com/hotels/road/security/CidrSecurityConfiguration.java
+++ b/common/security/src/main/java/com/hotels/road/security/CidrSecurityConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/security/src/main/java/com/hotels/road/security/LdapSecurityConfiguration.java b/common/security/src/main/java/com/hotels/road/security/LdapSecurityConfiguration.java
index 5b5d56f..27e5a66 100644
--- a/common/security/src/main/java/com/hotels/road/security/LdapSecurityConfiguration.java
+++ b/common/security/src/main/java/com/hotels/road/security/LdapSecurityConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/security/src/main/java/com/hotels/road/security/RemoteAddressFilter.java b/common/security/src/main/java/com/hotels/road/security/RemoteAddressFilter.java
index 72c4a02..cfaae61 100644
--- a/common/security/src/main/java/com/hotels/road/security/RemoteAddressFilter.java
+++ b/common/security/src/main/java/com/hotels/road/security/RemoteAddressFilter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/security/src/main/java/com/hotels/road/security/RoadWebSecurityConfigurerAdapter.java b/common/security/src/main/java/com/hotels/road/security/RoadWebSecurityConfigurerAdapter.java
index 6f8b538..1842dd1 100644
--- a/common/security/src/main/java/com/hotels/road/security/RoadWebSecurityConfigurerAdapter.java
+++ b/common/security/src/main/java/com/hotels/road/security/RoadWebSecurityConfigurerAdapter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/security/src/main/java/com/hotels/road/security/SecurityMetrics.java b/common/security/src/main/java/com/hotels/road/security/SecurityMetrics.java
index 8a714e5..8415441 100644
--- a/common/security/src/main/java/com/hotels/road/security/SecurityMetrics.java
+++ b/common/security/src/main/java/com/hotels/road/security/SecurityMetrics.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/security/src/test/java/com/hotels/road/security/CidrBlockAuthorisationTest.java b/common/security/src/test/java/com/hotels/road/security/CidrBlockAuthorisationTest.java
index 6f4ab2f..651c0d0 100644
--- a/common/security/src/test/java/com/hotels/road/security/CidrBlockAuthorisationTest.java
+++ b/common/security/src/test/java/com/hotels/road/security/CidrBlockAuthorisationTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/security/src/test/java/com/hotels/road/security/CidrBlockValidatorTest.java b/common/security/src/test/java/com/hotels/road/security/CidrBlockValidatorTest.java
index ad9c930..2d13a66 100644
--- a/common/security/src/test/java/com/hotels/road/security/CidrBlockValidatorTest.java
+++ b/common/security/src/test/java/com/hotels/road/security/CidrBlockValidatorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/security/src/test/java/com/hotels/road/security/RemoteAddressFilterTest.java b/common/security/src/test/java/com/hotels/road/security/RemoteAddressFilterTest.java
index aacbcd1..a171edc 100644
--- a/common/security/src/test/java/com/hotels/road/security/RemoteAddressFilterTest.java
+++ b/common/security/src/test/java/com/hotels/road/security/RemoteAddressFilterTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/security/src/test/java/com/hotels/road/security/SecurityMetricsTest.java b/common/security/src/test/java/com/hotels/road/security/SecurityMetricsTest.java
index c17b54e..fe396b8 100644
--- a/common/security/src/test/java/com/hotels/road/security/SecurityMetricsTest.java
+++ b/common/security/src/test/java/com/hotels/road/security/SecurityMetricsTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/security/src/test/resources/hazelcast.xml b/common/security/src/test/resources/hazelcast.xml
index d6f8929..d9819f5 100644
--- a/common/security/src/test/resources/hazelcast.xml
+++ b/common/security/src/test/resources/hazelcast.xml
@@ -1,5 +1,5 @@
-    <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+<!--
+  Copyright (C) 2016-2019 Expedia, 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/common/security/src/test/resources/logback-test.xml b/common/security/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/common/security/src/test/resources/logback-test.xml
+++ b/common/security/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/common/swagger/src/main/java/com/hotels/road/swagger/RoadSwagger2Controller.java b/common/swagger/src/main/java/com/hotels/road/swagger/RoadSwagger2Controller.java
index b628402..9a3665f 100644
--- a/common/swagger/src/main/java/com/hotels/road/swagger/RoadSwagger2Controller.java
+++ b/common/swagger/src/main/java/com/hotels/road/swagger/RoadSwagger2Controller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/swagger/src/main/java/com/hotels/road/swagger/SwaggerConfiguration.java b/common/swagger/src/main/java/com/hotels/road/swagger/SwaggerConfiguration.java
index 6ed222c..6ff540d 100644
--- a/common/swagger/src/main/java/com/hotels/road/swagger/SwaggerConfiguration.java
+++ b/common/swagger/src/main/java/com/hotels/road/swagger/SwaggerConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/tls/src/main/java/com/hotels/road/tls/TLSConfig.java b/common/tls/src/main/java/com/hotels/road/tls/TLSConfig.java
index 9ae595c..8b3e286 100644
--- a/common/tls/src/main/java/com/hotels/road/tls/TLSConfig.java
+++ b/common/tls/src/main/java/com/hotels/road/tls/TLSConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/AgentStoreObserver.java b/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/AgentStoreObserver.java
index beb7eb6..3ff6a95 100644
--- a/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/AgentStoreObserver.java
+++ b/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/AgentStoreObserver.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/ModelInspector.java b/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/ModelInspector.java
index fed73df..ce3945f 100644
--- a/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/ModelInspector.java
+++ b/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/ModelInspector.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/ModelSerializer.java b/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/ModelSerializer.java
index dff8e12..d1f5baa 100644
--- a/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/ModelSerializer.java
+++ b/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/ModelSerializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/MuteableStoreUpdateObserver.java b/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/MuteableStoreUpdateObserver.java
index ce9c338..82febc4 100644
--- a/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/MuteableStoreUpdateObserver.java
+++ b/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/MuteableStoreUpdateObserver.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/NullStoreUpdateObserver.java b/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/NullStoreUpdateObserver.java
index 1fb0e37..da453ec 100644
--- a/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/NullStoreUpdateObserver.java
+++ b/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/NullStoreUpdateObserver.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/TrafficCopConfiguration.java b/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/TrafficCopConfiguration.java
index 411373c..fde2135 100644
--- a/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/TrafficCopConfiguration.java
+++ b/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/TrafficCopConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/spi/Agent.java b/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/spi/Agent.java
index bfef597..26aeadf 100644
--- a/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/spi/Agent.java
+++ b/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/spi/Agent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/spi/ModelReader.java b/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/spi/ModelReader.java
index 7770791..d36ce13 100644
--- a/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/spi/ModelReader.java
+++ b/common/traffic-cop/src/main/java/com/hotels/road/agents/trafficcop/spi/ModelReader.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/AgentStoreObserverTest.java b/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/AgentStoreObserverTest.java
index e26f28c..88a21fc 100644
--- a/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/AgentStoreObserverTest.java
+++ b/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/AgentStoreObserverTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/JsonNodeSerializerTest.java b/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/JsonNodeSerializerTest.java
index 1ab9697..3c2fc58 100644
--- a/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/JsonNodeSerializerTest.java
+++ b/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/JsonNodeSerializerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/ModelInspectorTest.java b/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/ModelInspectorTest.java
index fb7eb11..f659277 100644
--- a/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/ModelInspectorTest.java
+++ b/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/ModelInspectorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/MuteableStoreUpdateObserverTest.java b/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/MuteableStoreUpdateObserverTest.java
index 5085933..36e9ecf 100644
--- a/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/MuteableStoreUpdateObserverTest.java
+++ b/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/MuteableStoreUpdateObserverTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/TrafficCopConfigurationTest.java b/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/TrafficCopConfigurationTest.java
index 222a1ed..cc42817 100644
--- a/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/TrafficCopConfigurationTest.java
+++ b/common/traffic-cop/src/test/java/com/hotels/road/agents/trafficcop/TrafficCopConfigurationTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/traffic-cop/src/test/resources/logback-test.xml b/common/traffic-cop/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/common/traffic-cop/src/test/resources/logback-test.xml
+++ b/common/traffic-cop/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/common/user-agent/core/src/main/java/com/hotels/road/user/agent/UserAgent.java b/common/user-agent/core/src/main/java/com/hotels/road/user/agent/UserAgent.java
index 53d368c..dc6d17e 100644
--- a/common/user-agent/core/src/main/java/com/hotels/road/user/agent/UserAgent.java
+++ b/common/user-agent/core/src/main/java/com/hotels/road/user/agent/UserAgent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/user-agent/core/src/test/java/com/hotels/road/user/agent/UserAgentTest.java b/common/user-agent/core/src/test/java/com/hotels/road/user/agent/UserAgentTest.java
index 4da5cee..657ec52 100644
--- a/common/user-agent/core/src/test/java/com/hotels/road/user/agent/UserAgentTest.java
+++ b/common/user-agent/core/src/test/java/com/hotels/road/user/agent/UserAgentTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/user-agent/core/src/test/resources/logback-test.xml b/common/user-agent/core/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/common/user-agent/core/src/test/resources/logback-test.xml
+++ b/common/user-agent/core/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/common/user-agent/filter/src/main/java/com/hotels/road/user/agent/UserAgentMetricFilter.java b/common/user-agent/filter/src/main/java/com/hotels/road/user/agent/UserAgentMetricFilter.java
index 09cc906..44124fa 100644
--- a/common/user-agent/filter/src/main/java/com/hotels/road/user/agent/UserAgentMetricFilter.java
+++ b/common/user-agent/filter/src/main/java/com/hotels/road/user/agent/UserAgentMetricFilter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/user-agent/filter/src/test/java/com/hotels/road/user/agent/UserAgentMetricFilterTest.java b/common/user-agent/filter/src/test/java/com/hotels/road/user/agent/UserAgentMetricFilterTest.java
index 3a88dbd..3fba5e9 100644
--- a/common/user-agent/filter/src/test/java/com/hotels/road/user/agent/UserAgentMetricFilterTest.java
+++ b/common/user-agent/filter/src/test/java/com/hotels/road/user/agent/UserAgentMetricFilterTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/user-agent/filter/src/test/resources/logback-test.xml b/common/user-agent/filter/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/common/user-agent/filter/src/test/resources/logback-test.xml
+++ b/common/user-agent/filter/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/common/user-agent/maven/src/main/java/com/hotels/road/user/agent/MavenUserAgent.java b/common/user-agent/maven/src/main/java/com/hotels/road/user/agent/MavenUserAgent.java
index 9bc88b7..a5e59e9 100644
--- a/common/user-agent/maven/src/main/java/com/hotels/road/user/agent/MavenUserAgent.java
+++ b/common/user-agent/maven/src/main/java/com/hotels/road/user/agent/MavenUserAgent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/user-agent/maven/src/test/java/com/hotels/road/user/agent/MavenUserAgentTest.java b/common/user-agent/maven/src/test/java/com/hotels/road/user/agent/MavenUserAgentTest.java
index 7f8d238..8e7e465 100644
--- a/common/user-agent/maven/src/test/java/com/hotels/road/user/agent/MavenUserAgentTest.java
+++ b/common/user-agent/maven/src/test/java/com/hotels/road/user/agent/MavenUserAgentTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/common/user-agent/maven/src/test/resources/logback-test.xml b/common/user-agent/maven/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/common/user-agent/maven/src/test/resources/logback-test.xml
+++ b/common/user-agent/maven/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/api/src/main/java/com/hotels/road/offramp/api/Payload.java b/endpoint/offramp/api/src/main/java/com/hotels/road/offramp/api/Payload.java
index 358d9ca..8b28557 100644
--- a/endpoint/offramp/api/src/main/java/com/hotels/road/offramp/api/Payload.java
+++ b/endpoint/offramp/api/src/main/java/com/hotels/road/offramp/api/Payload.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/api/src/main/java/com/hotels/road/offramp/api/Record.java b/endpoint/offramp/api/src/main/java/com/hotels/road/offramp/api/Record.java
index ccc01b2..8f3b4d7 100644
--- a/endpoint/offramp/api/src/main/java/com/hotels/road/offramp/api/Record.java
+++ b/endpoint/offramp/api/src/main/java/com/hotels/road/offramp/api/Record.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/api/src/main/java/com/hotels/road/offramp/api/SchemaProvider.java b/endpoint/offramp/api/src/main/java/com/hotels/road/offramp/api/SchemaProvider.java
index c0ed7f7..ac2258b 100644
--- a/endpoint/offramp/api/src/main/java/com/hotels/road/offramp/api/SchemaProvider.java
+++ b/endpoint/offramp/api/src/main/java/com/hotels/road/offramp/api/SchemaProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/api/src/main/java/com/hotels/road/offramp/api/UnknownRoadException.java b/endpoint/offramp/api/src/main/java/com/hotels/road/offramp/api/UnknownRoadException.java
index 5dba98d..2e62c32 100644
--- a/endpoint/offramp/api/src/main/java/com/hotels/road/offramp/api/UnknownRoadException.java
+++ b/endpoint/offramp/api/src/main/java/com/hotels/road/offramp/api/UnknownRoadException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/api/src/test/java/com/hotels/road/offramp/api/SchemaProviderTest.java b/endpoint/offramp/api/src/test/java/com/hotels/road/offramp/api/SchemaProviderTest.java
index 5552fa8..a902d7b 100644
--- a/endpoint/offramp/api/src/test/java/com/hotels/road/offramp/api/SchemaProviderTest.java
+++ b/endpoint/offramp/api/src/test/java/com/hotels/road/offramp/api/SchemaProviderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/api/src/test/resources/logback-test.xml b/endpoint/offramp/api/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/endpoint/offramp/api/src/test/resources/logback-test.xml
+++ b/endpoint/offramp/api/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/app/src/main/java/com/hotels/road/offramp/app/OfframpApp.java b/endpoint/offramp/app/src/main/java/com/hotels/road/offramp/app/OfframpApp.java
index 6d20b58..5171bf2 100644
--- a/endpoint/offramp/app/src/main/java/com/hotels/road/offramp/app/OfframpApp.java
+++ b/endpoint/offramp/app/src/main/java/com/hotels/road/offramp/app/OfframpApp.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/app/src/main/java/com/hotels/road/offramp/app/OfframpModelReader.java b/endpoint/offramp/app/src/main/java/com/hotels/road/offramp/app/OfframpModelReader.java
index 991711e..2964f37 100644
--- a/endpoint/offramp/app/src/main/java/com/hotels/road/offramp/app/OfframpModelReader.java
+++ b/endpoint/offramp/app/src/main/java/com/hotels/road/offramp/app/OfframpModelReader.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/app/src/main/resources/logback-spring.xml b/endpoint/offramp/app/src/main/resources/logback-spring.xml
index 1b4ff45..360d6ba 100644
--- a/endpoint/offramp/app/src/main/resources/logback-spring.xml
+++ b/endpoint/offramp/app/src/main/resources/logback-spring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/app/src/test/resources/logback-test.xml b/endpoint/offramp/app/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/endpoint/offramp/app/src/test/resources/logback-test.xml
+++ b/endpoint/offramp/app/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/multiframe/MultiFrameIntegrationTest.java b/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/multiframe/MultiFrameIntegrationTest.java
index d294b95..985a373 100644
--- a/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/multiframe/MultiFrameIntegrationTest.java
+++ b/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/multiframe/MultiFrameIntegrationTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/multiframe/TestMessage.java b/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/multiframe/TestMessage.java
index a23773c..0c690a3 100644
--- a/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/multiframe/TestMessage.java
+++ b/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/multiframe/TestMessage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.hotels.road.multiframe;
 
 import static java.lang.String.join;
diff --git a/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/multiframe/WebSocketHandlerTest.java b/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/multiframe/WebSocketHandlerTest.java
index b180221..2ab51d1 100644
--- a/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/multiframe/WebSocketHandlerTest.java
+++ b/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/multiframe/WebSocketHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/multiframe/WebSocketTestConfiguration.java b/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/multiframe/WebSocketTestConfiguration.java
index c421e94..ed8d235 100644
--- a/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/multiframe/WebSocketTestConfiguration.java
+++ b/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/multiframe/WebSocketTestConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.hotels.road.multiframe;
 
 import org.springframework.context.annotation.Bean;
diff --git a/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/offramp/OfframpIntegrationTest.java b/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/offramp/OfframpIntegrationTest.java
index fd82bfc..479af6c 100644
--- a/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/offramp/OfframpIntegrationTest.java
+++ b/endpoint/offramp/integration-tests/src/test/java/com/hotels/road/offramp/OfframpIntegrationTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/integration-tests/src/test/resources/logback-test.xml b/endpoint/offramp/integration-tests/src/test/resources/logback-test.xml
index d750756..b9b82c2 100644
--- a/endpoint/offramp/integration-tests/src/test/resources/logback-test.xml
+++ b/endpoint/offramp/integration-tests/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/AvroPayloadDecoder.java b/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/AvroPayloadDecoder.java
index baf979e..cbf8bcc 100644
--- a/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/AvroPayloadDecoder.java
+++ b/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/AvroPayloadDecoder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/BaseDeserializer.java b/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/BaseDeserializer.java
index b006689..d3b4820 100644
--- a/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/BaseDeserializer.java
+++ b/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/BaseDeserializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/KafkaConfiguration.java b/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/KafkaConfiguration.java
index 40cfc21..2d522e7 100644
--- a/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/KafkaConfiguration.java
+++ b/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/KafkaConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/KafkaRoadConsumer.java b/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/KafkaRoadConsumer.java
index 8876b41..6919dc7 100644
--- a/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/KafkaRoadConsumer.java
+++ b/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/KafkaRoadConsumer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/NullDeserializer.java b/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/NullDeserializer.java
index 79d1cb6..5b1c462 100644
--- a/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/NullDeserializer.java
+++ b/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/NullDeserializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/PayloadDeserializer.java b/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/PayloadDeserializer.java
index f4f538e..d1c7d40 100644
--- a/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/PayloadDeserializer.java
+++ b/endpoint/offramp/kafka/src/main/java/com/hotels/road/offramp/kafka/PayloadDeserializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/kafka/src/test/java/com/hotels/road/offramp/kafka/KafkaPayloadDeserializerTest.java b/endpoint/offramp/kafka/src/test/java/com/hotels/road/offramp/kafka/KafkaPayloadDeserializerTest.java
index 04ae830..d812f8a 100644
--- a/endpoint/offramp/kafka/src/test/java/com/hotels/road/offramp/kafka/KafkaPayloadDeserializerTest.java
+++ b/endpoint/offramp/kafka/src/test/java/com/hotels/road/offramp/kafka/KafkaPayloadDeserializerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/kafka/src/test/java/com/hotels/road/offramp/kafka/KafkaRoadConsumerTest.java b/endpoint/offramp/kafka/src/test/java/com/hotels/road/offramp/kafka/KafkaRoadConsumerTest.java
index ca32112..c9b2867 100644
--- a/endpoint/offramp/kafka/src/test/java/com/hotels/road/offramp/kafka/KafkaRoadConsumerTest.java
+++ b/endpoint/offramp/kafka/src/test/java/com/hotels/road/offramp/kafka/KafkaRoadConsumerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/kafka/src/test/resources/logback-test.xml b/endpoint/offramp/kafka/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/endpoint/offramp/kafka/src/test/resources/logback-test.xml
+++ b/endpoint/offramp/kafka/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Cancel.java b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Cancel.java
index ea059d9..bc2605d 100644
--- a/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Cancel.java
+++ b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Cancel.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Commit.java b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Commit.java
index f8c42db..8c772cd 100644
--- a/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Commit.java
+++ b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Commit.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/CommitResponse.java b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/CommitResponse.java
index 39fd3fb..1b4e8ce 100644
--- a/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/CommitResponse.java
+++ b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/CommitResponse.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Connection.java b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Connection.java
index f143070..bb7075d 100644
--- a/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Connection.java
+++ b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Connection.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/DefaultOffset.java b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/DefaultOffset.java
index a9125a0..cb353a8 100644
--- a/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/DefaultOffset.java
+++ b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/DefaultOffset.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Error.java b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Error.java
index edf447f..346461b 100644
--- a/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Error.java
+++ b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Error.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Event.java b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Event.java
index d2cd363..4cdaf45 100644
--- a/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Event.java
+++ b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Event.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Message.java b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Message.java
index 18fb1ac..3b2399e 100644
--- a/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Message.java
+++ b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Message.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Rebalance.java b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Rebalance.java
index 7ebe53f..a9930dc 100644
--- a/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Rebalance.java
+++ b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Rebalance.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Request.java b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Request.java
index 6581da0..82f7bc2 100644
--- a/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Request.java
+++ b/endpoint/offramp/model/src/main/java/com/hotels/road/offramp/model/Request.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/model/src/test/java/com/hotels/road/offramp/model/EventTest.java b/endpoint/offramp/model/src/test/java/com/hotels/road/offramp/model/EventTest.java
index 7ebb7a4..3dfc077 100644
--- a/endpoint/offramp/model/src/test/java/com/hotels/road/offramp/model/EventTest.java
+++ b/endpoint/offramp/model/src/test/java/com/hotels/road/offramp/model/EventTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/model/src/test/resources/logback-test.xml b/endpoint/offramp/model/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/endpoint/offramp/model/src/test/resources/logback-test.xml
+++ b/endpoint/offramp/model/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/KeyedSharedObjectPool.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/KeyedSharedObjectPool.java
index 7d2e6d2..3e57483 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/KeyedSharedObjectPool.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/KeyedSharedObjectPool.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/MeterPool.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/MeterPool.java
index 0f79cff..e1cd2bf 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/MeterPool.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/MeterPool.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/SettableGauge.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/SettableGauge.java
index 53c7337..34af4e6 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/SettableGauge.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/SettableGauge.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/SettableTimeGauge.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/SettableTimeGauge.java
index fc042eb..f143ef8 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/SettableTimeGauge.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/SettableTimeGauge.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/StreamMetrics.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/StreamMetrics.java
index 95aab71..3a4b94b 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/StreamMetrics.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/StreamMetrics.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/TimerTag.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/TimerTag.java
index 84a4944..bbe1be4 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/TimerTag.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/metrics/TimerTag.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/Encoder.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/Encoder.java
index 0d0d6f7..400a365 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/Encoder.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/Encoder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/JsonNodePiiReplacer.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/JsonNodePiiReplacer.java
index 5afbd8c..bed59dd 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/JsonNodePiiReplacer.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/JsonNodePiiReplacer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/JsonNodeTransformer.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/JsonNodeTransformer.java
index 7096853..145010e 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/JsonNodeTransformer.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/JsonNodeTransformer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/MessageFunction.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/MessageFunction.java
index 41a9499..c543e79 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/MessageFunction.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/MessageFunction.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/OfframpService.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/OfframpService.java
index 0b21819..70713bf 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/OfframpService.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/OfframpService.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/OfframpServiceFactory.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/OfframpServiceFactory.java
index 0ecda74..e5db91c 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/OfframpServiceFactory.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/OfframpServiceFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/OfframpServiceV2.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/OfframpServiceV2.java
index ae71ac5..ade3047 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/OfframpServiceV2.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/OfframpServiceV2.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/OfframpVersion.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/OfframpVersion.java
index 5c147e7..7e05ea9 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/OfframpVersion.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/OfframpVersion.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/PiiDataReplacer.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/PiiDataReplacer.java
index 2709596..a9bc0fe 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/PiiDataReplacer.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/service/PiiDataReplacer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/EventSender.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/EventSender.java
index cad7bcd..c95ef6c 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/EventSender.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/EventSender.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/OfframpAuthorisation.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/OfframpAuthorisation.java
index e4d135e..43f2588 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/OfframpAuthorisation.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/OfframpAuthorisation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/OfframpConfiguration.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/OfframpConfiguration.java
index c86164d..e4f378c 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/OfframpConfiguration.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/OfframpConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/OfframpHandshakeInterceptor.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/OfframpHandshakeInterceptor.java
index 7ff5990..09e4963 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/OfframpHandshakeInterceptor.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/OfframpHandshakeInterceptor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/OfframpWebSocketHandler.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/OfframpWebSocketHandler.java
index 3cc843a..cf017e9 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/OfframpWebSocketHandler.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/OfframpWebSocketHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/WebSocketConfiguration.java b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/WebSocketConfiguration.java
index 85f8164..2689da3 100644
--- a/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/WebSocketConfiguration.java
+++ b/endpoint/offramp/service/src/main/java/com/hotels/road/offramp/socket/WebSocketConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/metrics/KeyedSharedObjectPoolTest.java b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/metrics/KeyedSharedObjectPoolTest.java
index 5585748..b3ca95c 100644
--- a/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/metrics/KeyedSharedObjectPoolTest.java
+++ b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/metrics/KeyedSharedObjectPoolTest.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (C) 2016-2019 Expedia, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.hotels.road.offramp.metrics;
 
 import static org.hamcrest.Matchers.is;
diff --git a/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/metrics/OfframpMetricsTest.java b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/metrics/OfframpMetricsTest.java
index 8ba4267..3398753 100644
--- a/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/metrics/OfframpMetricsTest.java
+++ b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/metrics/OfframpMetricsTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/JsonNodePiiReplacerTest.java b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/JsonNodePiiReplacerTest.java
index 0c76d4a..022d19b 100644
--- a/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/JsonNodePiiReplacerTest.java
+++ b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/JsonNodePiiReplacerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/JsonNodeTransformerTest.java b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/JsonNodeTransformerTest.java
index 61853f8..ae9f23c 100644
--- a/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/JsonNodeTransformerTest.java
+++ b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/JsonNodeTransformerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/OfframpServiceFactoryTest.java b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/OfframpServiceFactoryTest.java
index 87d25d2..1eda513 100644
--- a/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/OfframpServiceFactoryTest.java
+++ b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/OfframpServiceFactoryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/OfframpServiceV2Test.java b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/OfframpServiceV2Test.java
index 46ae2b1..b6b4882 100644
--- a/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/OfframpServiceV2Test.java
+++ b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/OfframpServiceV2Test.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/OfframpVersionTest.java b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/OfframpVersionTest.java
index bae143e..93d9eb1 100644
--- a/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/OfframpVersionTest.java
+++ b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/service/OfframpVersionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/socket/OfframpAuthorisationTest.java b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/socket/OfframpAuthorisationTest.java
index 6fd025b..3601d48 100644
--- a/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/socket/OfframpAuthorisationTest.java
+++ b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/socket/OfframpAuthorisationTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/socket/OfframpHandshakeInterceptorTest.java b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/socket/OfframpHandshakeInterceptorTest.java
index b804c86..97ae331 100644
--- a/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/socket/OfframpHandshakeInterceptorTest.java
+++ b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/socket/OfframpHandshakeInterceptorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/socket/OfframpWebSocketHandlerTest.java b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/socket/OfframpWebSocketHandlerTest.java
index 815a332..6dd9e51 100644
--- a/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/socket/OfframpWebSocketHandlerTest.java
+++ b/endpoint/offramp/service/src/test/java/com/hotels/road/offramp/socket/OfframpWebSocketHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/service/src/test/resources/logback-test.xml b/endpoint/offramp/service/src/test/resources/logback-test.xml
index 09a298e..b72d984 100644
--- a/endpoint/offramp/service/src/test/resources/logback-test.xml
+++ b/endpoint/offramp/service/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/spi/src/main/java/com/hotels/road/offramp/spi/RoadConsumer.java b/endpoint/offramp/spi/src/main/java/com/hotels/road/offramp/spi/RoadConsumer.java
index 6c2894f..e334098 100644
--- a/endpoint/offramp/spi/src/main/java/com/hotels/road/offramp/spi/RoadConsumer.java
+++ b/endpoint/offramp/spi/src/main/java/com/hotels/road/offramp/spi/RoadConsumer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/offramp/spi/src/test/resources/logback-test.xml b/endpoint/offramp/spi/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/endpoint/offramp/spi/src/test/resources/logback-test.xml
+++ b/endpoint/offramp/spi/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/api/src/main/java/com/hotels/road/onramp/api/Event.java b/endpoint/onramp/api/src/main/java/com/hotels/road/onramp/api/Event.java
index 011635f..3cc9946 100644
--- a/endpoint/onramp/api/src/main/java/com/hotels/road/onramp/api/Event.java
+++ b/endpoint/onramp/api/src/main/java/com/hotels/road/onramp/api/Event.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/api/src/main/java/com/hotels/road/onramp/api/Onramp.java b/endpoint/onramp/api/src/main/java/com/hotels/road/onramp/api/Onramp.java
index 602533c..4f38c51 100644
--- a/endpoint/onramp/api/src/main/java/com/hotels/road/onramp/api/Onramp.java
+++ b/endpoint/onramp/api/src/main/java/com/hotels/road/onramp/api/Onramp.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/api/src/main/java/com/hotels/road/onramp/api/OnrampService.java b/endpoint/onramp/api/src/main/java/com/hotels/road/onramp/api/OnrampService.java
index eefd3f1..ccc5e22 100644
--- a/endpoint/onramp/api/src/main/java/com/hotels/road/onramp/api/OnrampService.java
+++ b/endpoint/onramp/api/src/main/java/com/hotels/road/onramp/api/OnrampService.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/api/src/main/java/com/hotels/road/onramp/api/OnrampTemplate.java b/endpoint/onramp/api/src/main/java/com/hotels/road/onramp/api/OnrampTemplate.java
index 68e01e4..eb8dd23 100644
--- a/endpoint/onramp/api/src/main/java/com/hotels/road/onramp/api/OnrampTemplate.java
+++ b/endpoint/onramp/api/src/main/java/com/hotels/road/onramp/api/OnrampTemplate.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/api/src/test/java/com/hotels/road/onramp/api/EventTest.java b/endpoint/onramp/api/src/test/java/com/hotels/road/onramp/api/EventTest.java
index 60e08db..06cfc18 100644
--- a/endpoint/onramp/api/src/test/java/com/hotels/road/onramp/api/EventTest.java
+++ b/endpoint/onramp/api/src/test/java/com/hotels/road/onramp/api/EventTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/api/src/test/java/com/hotels/road/onramp/api/OnrampTemplateTest.java b/endpoint/onramp/api/src/test/java/com/hotels/road/onramp/api/OnrampTemplateTest.java
index 40afd44..19287d3 100644
--- a/endpoint/onramp/api/src/test/java/com/hotels/road/onramp/api/OnrampTemplateTest.java
+++ b/endpoint/onramp/api/src/test/java/com/hotels/road/onramp/api/OnrampTemplateTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/api/src/test/resources/logback-test.xml b/endpoint/onramp/api/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/endpoint/onramp/api/src/test/resources/logback-test.xml
+++ b/endpoint/onramp/api/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/app/src/main/java/com/hotels/road/onramp/app/OnrampApp.java b/endpoint/onramp/app/src/main/java/com/hotels/road/onramp/app/OnrampApp.java
index aa3985f..b2c5e9e 100644
--- a/endpoint/onramp/app/src/main/java/com/hotels/road/onramp/app/OnrampApp.java
+++ b/endpoint/onramp/app/src/main/java/com/hotels/road/onramp/app/OnrampApp.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/app/src/main/resources/logback-spring.xml b/endpoint/onramp/app/src/main/resources/logback-spring.xml
index 64e925c..b82cd8b 100644
--- a/endpoint/onramp/app/src/main/resources/logback-spring.xml
+++ b/endpoint/onramp/app/src/main/resources/logback-spring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/controllers/src/main/java/com/hotels/road/onramp/OnrampControllerConfiguration.java b/endpoint/onramp/controllers/src/main/java/com/hotels/road/onramp/OnrampControllerConfiguration.java
index 8005d29..1e50258 100644
--- a/endpoint/onramp/controllers/src/main/java/com/hotels/road/onramp/OnrampControllerConfiguration.java
+++ b/endpoint/onramp/controllers/src/main/java/com/hotels/road/onramp/OnrampControllerConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/controllers/src/main/java/com/hotels/road/onramp/OnrampSwaggerConfiguration.java b/endpoint/onramp/controllers/src/main/java/com/hotels/road/onramp/OnrampSwaggerConfiguration.java
index b529ee2..049bfdb 100644
--- a/endpoint/onramp/controllers/src/main/java/com/hotels/road/onramp/OnrampSwaggerConfiguration.java
+++ b/endpoint/onramp/controllers/src/main/java/com/hotels/road/onramp/OnrampSwaggerConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/controllers/src/main/java/com/hotels/road/onramp/controller/OnrampAuthorisation.java b/endpoint/onramp/controllers/src/main/java/com/hotels/road/onramp/controller/OnrampAuthorisation.java
index 9b40803..83c25ea 100644
--- a/endpoint/onramp/controllers/src/main/java/com/hotels/road/onramp/controller/OnrampAuthorisation.java
+++ b/endpoint/onramp/controllers/src/main/java/com/hotels/road/onramp/controller/OnrampAuthorisation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/controllers/src/main/java/com/hotels/road/onramp/controller/OnrampController.java b/endpoint/onramp/controllers/src/main/java/com/hotels/road/onramp/controller/OnrampController.java
index 2340f86..79deeef 100644
--- a/endpoint/onramp/controllers/src/main/java/com/hotels/road/onramp/controller/OnrampController.java
+++ b/endpoint/onramp/controllers/src/main/java/com/hotels/road/onramp/controller/OnrampController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/controllers/src/test/java/com/hotels/road/onramp/controller/OnrampAuthorisationTest.java b/endpoint/onramp/controllers/src/test/java/com/hotels/road/onramp/controller/OnrampAuthorisationTest.java
index 92999c0..86e0b16 100644
--- a/endpoint/onramp/controllers/src/test/java/com/hotels/road/onramp/controller/OnrampAuthorisationTest.java
+++ b/endpoint/onramp/controllers/src/test/java/com/hotels/road/onramp/controller/OnrampAuthorisationTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/controllers/src/test/java/com/hotels/road/onramp/controller/OnrampControllerTest.java b/endpoint/onramp/controllers/src/test/java/com/hotels/road/onramp/controller/OnrampControllerTest.java
index 1c0b16b..e4a36aa 100644
--- a/endpoint/onramp/controllers/src/test/java/com/hotels/road/onramp/controller/OnrampControllerTest.java
+++ b/endpoint/onramp/controllers/src/test/java/com/hotels/road/onramp/controller/OnrampControllerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/controllers/src/test/java/com/hotels/road/onramp/controller/TestConfig.java b/endpoint/onramp/controllers/src/test/java/com/hotels/road/onramp/controller/TestConfig.java
index 87cefbc..8a93f6d 100644
--- a/endpoint/onramp/controllers/src/test/java/com/hotels/road/onramp/controller/TestConfig.java
+++ b/endpoint/onramp/controllers/src/test/java/com/hotels/road/onramp/controller/TestConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/controllers/src/test/resources/logback-test.xml b/endpoint/onramp/controllers/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/endpoint/onramp/controllers/src/test/resources/logback-test.xml
+++ b/endpoint/onramp/controllers/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/AvroValueEncoder.java b/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/AvroValueEncoder.java
index 3ecc302..15af41c 100644
--- a/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/AvroValueEncoder.java
+++ b/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/AvroValueEncoder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/JsonKeyEncoder.java b/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/JsonKeyEncoder.java
index f19ad3a..9ac4d39 100644
--- a/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/JsonKeyEncoder.java
+++ b/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/JsonKeyEncoder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/OnrampImpl.java b/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/OnrampImpl.java
index f180a28..fe21787 100644
--- a/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/OnrampImpl.java
+++ b/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/OnrampImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/OnrampMetrics.java b/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/OnrampMetrics.java
index 7ee9cf4..bc257f0 100644
--- a/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/OnrampMetrics.java
+++ b/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/OnrampMetrics.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/OnrampServiceConfiguration.java b/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/OnrampServiceConfiguration.java
index 4dc9ea7..91fe84a 100644
--- a/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/OnrampServiceConfiguration.java
+++ b/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/OnrampServiceConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/OnrampServiceImpl.java b/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/OnrampServiceImpl.java
index ef80b3c..9beaeb8 100644
--- a/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/OnrampServiceImpl.java
+++ b/endpoint/onramp/kafka-impl/src/main/java/com/hotels/road/onramp/kafka/OnrampServiceImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/AvroValueEncoderTest.java b/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/AvroValueEncoderTest.java
index b615e12..23ee1eb 100644
--- a/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/AvroValueEncoderTest.java
+++ b/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/AvroValueEncoderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/JsonKeyEncoderTest.java b/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/JsonKeyEncoderTest.java
index a0b1d0e..09f01d2 100644
--- a/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/JsonKeyEncoderTest.java
+++ b/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/JsonKeyEncoderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/OnrampImplTest.java b/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/OnrampImplTest.java
index ed61de9..e6ab75b 100644
--- a/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/OnrampImplTest.java
+++ b/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/OnrampImplTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/OnrampMetricsTest.java b/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/OnrampMetricsTest.java
index a73ccbc..c684da8 100644
--- a/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/OnrampMetricsTest.java
+++ b/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/OnrampMetricsTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/OnrampServiceImplTest.java b/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/OnrampServiceImplTest.java
index 01bee15..9f01c00 100644
--- a/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/OnrampServiceImplTest.java
+++ b/endpoint/onramp/kafka-impl/src/test/java/com/hotels/road/onramp/kafka/OnrampServiceImplTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/onramp/kafka-impl/src/test/resources/logback-test.xml b/endpoint/onramp/kafka-impl/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/endpoint/onramp/kafka-impl/src/test/resources/logback-test.xml
+++ b/endpoint/onramp/kafka-impl/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/api/src/main/java/com/hotels/road/paver/api/HiveDestinationAdminClient.java b/endpoint/paver/api/src/main/java/com/hotels/road/paver/api/HiveDestinationAdminClient.java
index 44f8c53..7d3425b 100644
--- a/endpoint/paver/api/src/main/java/com/hotels/road/paver/api/HiveDestinationAdminClient.java
+++ b/endpoint/paver/api/src/main/java/com/hotels/road/paver/api/HiveDestinationAdminClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/api/src/main/java/com/hotels/road/paver/api/RoadAdminClient.java b/endpoint/paver/api/src/main/java/com/hotels/road/paver/api/RoadAdminClient.java
index c435d9e..5dd06de 100644
--- a/endpoint/paver/api/src/main/java/com/hotels/road/paver/api/RoadAdminClient.java
+++ b/endpoint/paver/api/src/main/java/com/hotels/road/paver/api/RoadAdminClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/api/src/main/java/com/hotels/road/paver/api/SchemaStoreClient.java b/endpoint/paver/api/src/main/java/com/hotels/road/paver/api/SchemaStoreClient.java
index feca350..302fa3c 100644
--- a/endpoint/paver/api/src/main/java/com/hotels/road/paver/api/SchemaStoreClient.java
+++ b/endpoint/paver/api/src/main/java/com/hotels/road/paver/api/SchemaStoreClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/app/src/main/java/com/hotels/road/paver/app/InfoController.java b/endpoint/paver/app/src/main/java/com/hotels/road/paver/app/InfoController.java
index a113fd5..198e258 100644
--- a/endpoint/paver/app/src/main/java/com/hotels/road/paver/app/InfoController.java
+++ b/endpoint/paver/app/src/main/java/com/hotels/road/paver/app/InfoController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/app/src/main/java/com/hotels/road/paver/app/PaverApp.java b/endpoint/paver/app/src/main/java/com/hotels/road/paver/app/PaverApp.java
index 7053c4a..cb91bdd 100644
--- a/endpoint/paver/app/src/main/java/com/hotels/road/paver/app/PaverApp.java
+++ b/endpoint/paver/app/src/main/java/com/hotels/road/paver/app/PaverApp.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/app/src/main/resources/logback-spring.xml b/endpoint/paver/app/src/main/resources/logback-spring.xml
index 1b4ff45..360d6ba 100644
--- a/endpoint/paver/app/src/main/resources/logback-spring.xml
+++ b/endpoint/paver/app/src/main/resources/logback-spring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/app/src/test/resources/logback-test.xml b/endpoint/paver/app/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/endpoint/paver/app/src/test/resources/logback-test.xml
+++ b/endpoint/paver/app/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/PaverControllerConfiguration.java b/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/PaverControllerConfiguration.java
index 8c06310..5938495 100644
--- a/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/PaverControllerConfiguration.java
+++ b/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/PaverControllerConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/PaverSwaggerConfiguration.java b/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/PaverSwaggerConfiguration.java
index 7ec95f8..07b6720 100644
--- a/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/PaverSwaggerConfiguration.java
+++ b/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/PaverSwaggerConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/HiveDestinationController.java b/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/HiveDestinationController.java
index 37afe19..81eb322 100644
--- a/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/HiveDestinationController.java
+++ b/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/HiveDestinationController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/PaverAuthorisation.java b/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/PaverAuthorisation.java
index b052bfb..9b6f3a1 100644
--- a/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/PaverAuthorisation.java
+++ b/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/PaverAuthorisation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/PaverConstants.java b/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/PaverConstants.java
index 5484cb3..aedcf83 100644
--- a/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/PaverConstants.java
+++ b/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/PaverConstants.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/PaverExceptionHandlers.java b/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/PaverExceptionHandlers.java
index 116c3e3..c0e3a9c 100644
--- a/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/PaverExceptionHandlers.java
+++ b/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/PaverExceptionHandlers.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/RoadController.java b/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/RoadController.java
index a284783..e286726 100644
--- a/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/RoadController.java
+++ b/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/RoadController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/SchemaController.java b/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/SchemaController.java
index d824e0c..2639f81 100644
--- a/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/SchemaController.java
+++ b/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/SchemaController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/VersionController.java b/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/VersionController.java
index a758236..183c1ae 100644
--- a/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/VersionController.java
+++ b/endpoint/paver/controllers/src/main/java/com/hotels/road/paver/controller/VersionController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/HiveDestinationControllerTest.java b/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/HiveDestinationControllerTest.java
index c1708e3..d373113 100644
--- a/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/HiveDestinationControllerTest.java
+++ b/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/HiveDestinationControllerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/PaverAuthorisationTest.java b/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/PaverAuthorisationTest.java
index 2608b7a..87df061 100644
--- a/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/PaverAuthorisationTest.java
+++ b/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/PaverAuthorisationTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/RoadControllerTest.java b/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/RoadControllerTest.java
index 3160180..ecf7579 100644
--- a/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/RoadControllerTest.java
+++ b/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/RoadControllerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/SchemaControllerTest.java b/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/SchemaControllerTest.java
index f45fb38..8b91521 100644
--- a/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/SchemaControllerTest.java
+++ b/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/SchemaControllerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/VersionControllerTest.java b/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/VersionControllerTest.java
index ffd6d7e..aafa083 100644
--- a/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/VersionControllerTest.java
+++ b/endpoint/paver/controllers/src/test/java/com/hotels/road/paver/controller/VersionControllerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/controllers/src/test/resources/logback-test.xml b/endpoint/paver/controllers/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/endpoint/paver/controllers/src/test/resources/logback-test.xml
+++ b/endpoint/paver/controllers/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/HiveDestinationService.java b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/HiveDestinationService.java
index 23af64c..021c477 100644
--- a/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/HiveDestinationService.java
+++ b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/HiveDestinationService.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/HiveDestinationServiceImpl.java b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/HiveDestinationServiceImpl.java
index 2faaf39..ed2cbe7 100644
--- a/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/HiveDestinationServiceImpl.java
+++ b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/HiveDestinationServiceImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/PaverService.java b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/PaverService.java
index 601e145..d1f4fd0 100644
--- a/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/PaverService.java
+++ b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/PaverService.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/PaverServiceConfiguration.java b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/PaverServiceConfiguration.java
index 30b1e22..841ee65 100644
--- a/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/PaverServiceConfiguration.java
+++ b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/PaverServiceConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/PaverServiceImpl.java b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/PaverServiceImpl.java
index ca9f0b2..0fdae29 100644
--- a/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/PaverServiceImpl.java
+++ b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/PaverServiceImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/RoadSchemaNotificationHandler.java b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/RoadSchemaNotificationHandler.java
index f4077d1..eff0ed4 100644
--- a/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/RoadSchemaNotificationHandler.java
+++ b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/RoadSchemaNotificationHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/exception/InvalidLandingIntervalException.java b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/exception/InvalidLandingIntervalException.java
index 2f1925a..a863f5f 100644
--- a/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/exception/InvalidLandingIntervalException.java
+++ b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/exception/InvalidLandingIntervalException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/exception/NoSuchSchemaException.java b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/exception/NoSuchSchemaException.java
index b31c084..ff9443d 100644
--- a/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/exception/NoSuchSchemaException.java
+++ b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/exception/NoSuchSchemaException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/DefaultStringPatchMapping.java b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/DefaultStringPatchMapping.java
index 838a4fe..e81ceda 100644
--- a/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/DefaultStringPatchMapping.java
+++ b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/DefaultStringPatchMapping.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/EnabledPatchMapping.java b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/EnabledPatchMapping.java
index 8ab7212..d215a3a 100644
--- a/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/EnabledPatchMapping.java
+++ b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/EnabledPatchMapping.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/ListPatchMapping.java b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/ListPatchMapping.java
index 40130d0..aef20dd 100644
--- a/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/ListPatchMapping.java
+++ b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/ListPatchMapping.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/MetadataPatchMapping.java b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/MetadataPatchMapping.java
index 6b4833a..ac6399e 100644
--- a/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/MetadataPatchMapping.java
+++ b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/MetadataPatchMapping.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/OfframpAuthPatchMapping.java b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/OfframpAuthPatchMapping.java
index af37fbe..a82666b 100644
--- a/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/OfframpAuthPatchMapping.java
+++ b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/OfframpAuthPatchMapping.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/PartitionPathPatchMapping.java b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/PartitionPathPatchMapping.java
index 574cb9c..1ed5739 100644
--- a/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/PartitionPathPatchMapping.java
+++ b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/PartitionPathPatchMapping.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/PatchMapping.java b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/PatchMapping.java
index ebf6bc6..6efc050 100644
--- a/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/PatchMapping.java
+++ b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/PatchMapping.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/PatchMappingConfiguration.java b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/PatchMappingConfiguration.java
index bbc4810..5754b47 100644
--- a/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/PatchMappingConfiguration.java
+++ b/endpoint/paver/service/src/main/java/com/hotels/road/paver/service/patchmapping/PatchMappingConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/HiveDestinationServiceImplTest.java b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/HiveDestinationServiceImplTest.java
index df926e2..af7117c 100644
--- a/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/HiveDestinationServiceImplTest.java
+++ b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/HiveDestinationServiceImplTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/PaverServiceImplTest.java b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/PaverServiceImplTest.java
index e0a8c28..15fd0d7 100644
--- a/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/PaverServiceImplTest.java
+++ b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/PaverServiceImplTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/RoadSchemaNotificationHandlerTest.java b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/RoadSchemaNotificationHandlerTest.java
index 1f8cf37..fe5a73c 100644
--- a/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/RoadSchemaNotificationHandlerTest.java
+++ b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/RoadSchemaNotificationHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/AbstractPatchMappingTest.java b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/AbstractPatchMappingTest.java
index 77915c0..92576ce 100644
--- a/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/AbstractPatchMappingTest.java
+++ b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/AbstractPatchMappingTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/DefaultStringPatchMappingTest.java b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/DefaultStringPatchMappingTest.java
index 16618ba..17f348b 100644
--- a/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/DefaultStringPatchMappingTest.java
+++ b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/DefaultStringPatchMappingTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/EnabledPatchMappingTest.java b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/EnabledPatchMappingTest.java
index c734b07..0f1ecfb 100644
--- a/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/EnabledPatchMappingTest.java
+++ b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/EnabledPatchMappingTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/ListPatchMappingTest.java b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/ListPatchMappingTest.java
index c8c491e..29289b1 100644
--- a/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/ListPatchMappingTest.java
+++ b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/ListPatchMappingTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/MetadataPatchMappingTest.java b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/MetadataPatchMappingTest.java
index 216ce46..597b0e0 100644
--- a/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/MetadataPatchMappingTest.java
+++ b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/MetadataPatchMappingTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/OfframpAuthPatchMappingTest.java b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/OfframpAuthPatchMappingTest.java
index 3b3ecd3..b69704f 100644
--- a/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/OfframpAuthPatchMappingTest.java
+++ b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/OfframpAuthPatchMappingTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/PartitionPathPatchMappingTest.java b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/PartitionPathPatchMappingTest.java
index 6299510..10609c9 100644
--- a/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/PartitionPathPatchMappingTest.java
+++ b/endpoint/paver/service/src/test/java/com/hotels/road/paver/service/patchmapping/PartitionPathPatchMappingTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/service/src/test/resources/logback-test.xml b/endpoint/paver/service/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/endpoint/paver/service/src/test/resources/logback-test.xml
+++ b/endpoint/paver/service/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/tollbooth-impl/src/main/java/com/hotels/road/paver/tollbooth/PaverTollboothServiceConfiguration.java b/endpoint/paver/tollbooth-impl/src/main/java/com/hotels/road/paver/tollbooth/PaverTollboothServiceConfiguration.java
index f4f5281..25941c9 100644
--- a/endpoint/paver/tollbooth-impl/src/main/java/com/hotels/road/paver/tollbooth/PaverTollboothServiceConfiguration.java
+++ b/endpoint/paver/tollbooth-impl/src/main/java/com/hotels/road/paver/tollbooth/PaverTollboothServiceConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/tollbooth-impl/src/main/java/com/hotels/road/paver/tollbooth/TollBoothHiveDestinationAdminClient.java b/endpoint/paver/tollbooth-impl/src/main/java/com/hotels/road/paver/tollbooth/TollBoothHiveDestinationAdminClient.java
index d60d9e5..bda8cce 100644
--- a/endpoint/paver/tollbooth-impl/src/main/java/com/hotels/road/paver/tollbooth/TollBoothHiveDestinationAdminClient.java
+++ b/endpoint/paver/tollbooth-impl/src/main/java/com/hotels/road/paver/tollbooth/TollBoothHiveDestinationAdminClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/tollbooth-impl/src/main/java/com/hotels/road/paver/tollbooth/TollboothRoadAdminClient.java b/endpoint/paver/tollbooth-impl/src/main/java/com/hotels/road/paver/tollbooth/TollboothRoadAdminClient.java
index d81bb41..194ba0a 100644
--- a/endpoint/paver/tollbooth-impl/src/main/java/com/hotels/road/paver/tollbooth/TollboothRoadAdminClient.java
+++ b/endpoint/paver/tollbooth-impl/src/main/java/com/hotels/road/paver/tollbooth/TollboothRoadAdminClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/tollbooth-impl/src/main/java/com/hotels/road/paver/tollbooth/TollboothSchemaStoreClient.java b/endpoint/paver/tollbooth-impl/src/main/java/com/hotels/road/paver/tollbooth/TollboothSchemaStoreClient.java
index 16927c3..6063ef2 100644
--- a/endpoint/paver/tollbooth-impl/src/main/java/com/hotels/road/paver/tollbooth/TollboothSchemaStoreClient.java
+++ b/endpoint/paver/tollbooth-impl/src/main/java/com/hotels/road/paver/tollbooth/TollboothSchemaStoreClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/tollbooth-impl/src/test/java/com/hotels/road/paver/tollbooth/TollBoothHiveDestinationAdminClientTest.java b/endpoint/paver/tollbooth-impl/src/test/java/com/hotels/road/paver/tollbooth/TollBoothHiveDestinationAdminClientTest.java
index f136132..4edca43 100644
--- a/endpoint/paver/tollbooth-impl/src/test/java/com/hotels/road/paver/tollbooth/TollBoothHiveDestinationAdminClientTest.java
+++ b/endpoint/paver/tollbooth-impl/src/test/java/com/hotels/road/paver/tollbooth/TollBoothHiveDestinationAdminClientTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/tollbooth-impl/src/test/java/com/hotels/road/paver/tollbooth/TollboothRoadAdminClientTest.java b/endpoint/paver/tollbooth-impl/src/test/java/com/hotels/road/paver/tollbooth/TollboothRoadAdminClientTest.java
index 1cb5869..f50e028 100644
--- a/endpoint/paver/tollbooth-impl/src/test/java/com/hotels/road/paver/tollbooth/TollboothRoadAdminClientTest.java
+++ b/endpoint/paver/tollbooth-impl/src/test/java/com/hotels/road/paver/tollbooth/TollboothRoadAdminClientTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/tollbooth-impl/src/test/java/com/hotels/road/paver/tollbooth/TollboothSchemaStoreClientTest.java b/endpoint/paver/tollbooth-impl/src/test/java/com/hotels/road/paver/tollbooth/TollboothSchemaStoreClientTest.java
index f970015..dafd380 100644
--- a/endpoint/paver/tollbooth-impl/src/test/java/com/hotels/road/paver/tollbooth/TollboothSchemaStoreClientTest.java
+++ b/endpoint/paver/tollbooth-impl/src/test/java/com/hotels/road/paver/tollbooth/TollboothSchemaStoreClientTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/endpoint/paver/tollbooth-impl/src/test/resources/logback-test.xml b/endpoint/paver/tollbooth-impl/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/endpoint/paver/tollbooth-impl/src/test/resources/logback-test.xml
+++ b/endpoint/paver/tollbooth-impl/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/HealthChecks.java b/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/HealthChecks.java
index 2b891ae..ac72a1d 100644
--- a/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/HealthChecks.java
+++ b/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/HealthChecks.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/HighwayPatrolApp.java b/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/HighwayPatrolApp.java
index 1e6eb19..49bbd7c 100644
--- a/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/HighwayPatrolApp.java
+++ b/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/HighwayPatrolApp.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/MessageState.java b/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/MessageState.java
index 3cf1d89..8b8fa8b 100644
--- a/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/MessageState.java
+++ b/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/MessageState.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/MessagesMetricSet.java b/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/MessagesMetricSet.java
index 46e0040..2d5dd39 100644
--- a/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/MessagesMetricSet.java
+++ b/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/MessagesMetricSet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/Receiver.java b/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/Receiver.java
index 40c7d2b..5f319c8 100644
--- a/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/Receiver.java
+++ b/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/Receiver.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/Sender.java b/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/Sender.java
index 9537dfa..f8113d4 100644
--- a/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/Sender.java
+++ b/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/Sender.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/TestMessage.java b/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/TestMessage.java
index 4e3a6ff..d43430d 100644
--- a/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/TestMessage.java
+++ b/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/TestMessage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/TestMessageContext.java b/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/TestMessageContext.java
index 0299ab3..2dc2048 100644
--- a/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/TestMessageContext.java
+++ b/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/TestMessageContext.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/TestMessageContextManager.java b/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/TestMessageContextManager.java
index 833d1a2..8b410f0 100644
--- a/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/TestMessageContextManager.java
+++ b/monitoring/highway-patrol/src/main/java/com/hotels/road/highwaypatrol/TestMessageContextManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/highway-patrol/src/main/resources/logback-spring.xml b/monitoring/highway-patrol/src/main/resources/logback-spring.xml
index 7bd64d1..e389b2a 100644
--- a/monitoring/highway-patrol/src/main/resources/logback-spring.xml
+++ b/monitoring/highway-patrol/src/main/resources/logback-spring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/MessagesMetricSetTest.java b/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/MessagesMetricSetTest.java
index 2d858ca..7380b3b 100644
--- a/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/MessagesMetricSetTest.java
+++ b/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/MessagesMetricSetTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/ReceiverTest.java b/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/ReceiverTest.java
index 92adc98..f851f96 100644
--- a/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/ReceiverTest.java
+++ b/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/ReceiverTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/SenderTest.java b/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/SenderTest.java
index 0b50858..f810dbf 100644
--- a/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/SenderTest.java
+++ b/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/SenderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/TestMessageContextManagerTest.java b/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/TestMessageContextManagerTest.java
index d3048e1..49dbc62 100644
--- a/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/TestMessageContextManagerTest.java
+++ b/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/TestMessageContextManagerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/TestMessageContextTest.java b/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/TestMessageContextTest.java
index 3b296f5..fb5cbd0 100644
--- a/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/TestMessageContextTest.java
+++ b/monitoring/highway-patrol/src/test/java/com/hotels/road/highwaypatrol/TestMessageContextTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/highway-patrol/src/test/resources/logback-test.xml b/monitoring/highway-patrol/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/monitoring/highway-patrol/src/test/resources/logback-test.xml
+++ b/monitoring/highway-patrol/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/monitoring/kafka-offset-metrics/src/main/java/com/hotels/road/kafka/offset/metrics/KafkaOffsetMetrics.java b/monitoring/kafka-offset-metrics/src/main/java/com/hotels/road/kafka/offset/metrics/KafkaOffsetMetrics.java
index ff036e9..46316bb 100644
--- a/monitoring/kafka-offset-metrics/src/main/java/com/hotels/road/kafka/offset/metrics/KafkaOffsetMetrics.java
+++ b/monitoring/kafka-offset-metrics/src/main/java/com/hotels/road/kafka/offset/metrics/KafkaOffsetMetrics.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/kafka-offset-metrics/src/main/java/com/hotels/road/kafka/offset/metrics/KafkaOffsetMetricsApp.java b/monitoring/kafka-offset-metrics/src/main/java/com/hotels/road/kafka/offset/metrics/KafkaOffsetMetricsApp.java
index 52efd53..600a08b 100644
--- a/monitoring/kafka-offset-metrics/src/main/java/com/hotels/road/kafka/offset/metrics/KafkaOffsetMetricsApp.java
+++ b/monitoring/kafka-offset-metrics/src/main/java/com/hotels/road/kafka/offset/metrics/KafkaOffsetMetricsApp.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/kafka-offset-metrics/src/main/resources/logback-spring.xml b/monitoring/kafka-offset-metrics/src/main/resources/logback-spring.xml
index 0d16d4d..fb26058 100644
--- a/monitoring/kafka-offset-metrics/src/main/resources/logback-spring.xml
+++ b/monitoring/kafka-offset-metrics/src/main/resources/logback-spring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/monitoring/kafka-offset-metrics/src/test/java/com/hotels/road/kafka/offset/metrics/KafkaOffsetMetricsTest.java b/monitoring/kafka-offset-metrics/src/test/java/com/hotels/road/kafka/offset/metrics/KafkaOffsetMetricsTest.java
index 0e56c3b..1116293 100644
--- a/monitoring/kafka-offset-metrics/src/test/java/com/hotels/road/kafka/offset/metrics/KafkaOffsetMetricsTest.java
+++ b/monitoring/kafka-offset-metrics/src/test/java/com/hotels/road/kafka/offset/metrics/KafkaOffsetMetricsTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/kafka-offset-metrics/src/test/resources/logback-test.xml b/monitoring/kafka-offset-metrics/src/test/resources/logback-test.xml
index af9b4a7..0f617eb 100644
--- a/monitoring/kafka-offset-metrics/src/test/resources/logback-test.xml
+++ b/monitoring/kafka-offset-metrics/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/BrokerRefresher.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/BrokerRefresher.java
index e27a5ee..ddc4d26 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/BrokerRefresher.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/BrokerRefresher.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/BrokerSupplier.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/BrokerSupplier.java
index e03b8da..4e018d9 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/BrokerSupplier.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/BrokerSupplier.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/WeighBridgeApp.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/WeighBridgeApp.java
index b6f5a10..a4768ae 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/WeighBridgeApp.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/WeighBridgeApp.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/WeighBridgeController.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/WeighBridgeController.java
index 48ed1fb..930619d 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/WeighBridgeController.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/WeighBridgeController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/WeighBridgeMetrics.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/WeighBridgeMetrics.java
index f3c80cd..51380c2 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/WeighBridgeMetrics.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/WeighBridgeMetrics.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/BrokerNodeFunction.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/BrokerNodeFunction.java
index 2bdc73d..e66e1f3 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/BrokerNodeFunction.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/BrokerNodeFunction.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/DiskByLogDirFunction.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/DiskByLogDirFunction.java
index 03465b5..ee4f714 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/DiskByLogDirFunction.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/DiskByLogDirFunction.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/HostPredicate.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/HostPredicate.java
index dc0b491..a34aa7b 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/HostPredicate.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/HostPredicate.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/KafkaFutures.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/KafkaFutures.java
index 6289ad6..38ad6aa 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/KafkaFutures.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/KafkaFutures.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/LeaderInSyncByPartitionFunction.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/LeaderInSyncByPartitionFunction.java
index 99d2966..a5c3aa2 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/LeaderInSyncByPartitionFunction.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/LeaderInSyncByPartitionFunction.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/OffsetsByPartitionFunction.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/OffsetsByPartitionFunction.java
index 854f323..8a11df9 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/OffsetsByPartitionFunction.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/OffsetsByPartitionFunction.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/ReplicaByPartitionFunction.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/ReplicaByPartitionFunction.java
index 0a7dc3b..6ae6780 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/ReplicaByPartitionFunction.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/ReplicaByPartitionFunction.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/RetentionByTopicFunction.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/RetentionByTopicFunction.java
index 950bd01..d1d9d85 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/RetentionByTopicFunction.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/RetentionByTopicFunction.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/SizeByPartitionFunction.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/SizeByPartitionFunction.java
index b4ff07a..d1ac327 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/SizeByPartitionFunction.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/function/SizeByPartitionFunction.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/Broker.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/Broker.java
index e77f49f..f5e23e3 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/Broker.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/Broker.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/BrokerSerializer.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/BrokerSerializer.java
index 9fed601..900accc 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/BrokerSerializer.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/BrokerSerializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/LogDir.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/LogDir.java
index 36cefb6..045d8e3 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/LogDir.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/LogDir.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/PartitionReplica.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/PartitionReplica.java
index d905c3a..24540f7 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/PartitionReplica.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/PartitionReplica.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/Topic.java b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/Topic.java
index 69d6ae8..7dcbaaf 100644
--- a/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/Topic.java
+++ b/monitoring/weigh-bridge/src/main/java/com/hotels/road/weighbridge/model/Topic.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/BrokerSupplierTest.java b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/BrokerSupplierTest.java
index ba7135c..d382b09 100644
--- a/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/BrokerSupplierTest.java
+++ b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/BrokerSupplierTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/WeighBridgeControllerTest.java b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/WeighBridgeControllerTest.java
index 049c9be..f3ad674 100644
--- a/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/WeighBridgeControllerTest.java
+++ b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/WeighBridgeControllerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/WeighBridgeMetricsTest.java b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/WeighBridgeMetricsTest.java
index c4af1af..22fbc26 100644
--- a/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/WeighBridgeMetricsTest.java
+++ b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/WeighBridgeMetricsTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/BrokerNodeFunctionTest.java b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/BrokerNodeFunctionTest.java
index 29efeef..4e3db73 100644
--- a/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/BrokerNodeFunctionTest.java
+++ b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/BrokerNodeFunctionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/DiskByLogDirFunctionTest.java b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/DiskByLogDirFunctionTest.java
index 1bf5959..0ec41ef 100644
--- a/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/DiskByLogDirFunctionTest.java
+++ b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/DiskByLogDirFunctionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/HostPredicateTest.java b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/HostPredicateTest.java
index 0a363a1..f67251e 100644
--- a/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/HostPredicateTest.java
+++ b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/HostPredicateTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/KafkaFuturesTest.java b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/KafkaFuturesTest.java
index a3ebf8d..a12a0dc 100644
--- a/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/KafkaFuturesTest.java
+++ b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/KafkaFuturesTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/LeaderInSyncByPartitionFunctionTest.java b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/LeaderInSyncByPartitionFunctionTest.java
index 31136ed..6d786db 100644
--- a/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/LeaderInSyncByPartitionFunctionTest.java
+++ b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/LeaderInSyncByPartitionFunctionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/OffsetsByPartitionFunctionTest.java b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/OffsetsByPartitionFunctionTest.java
index 5e0202f..fdc729a 100644
--- a/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/OffsetsByPartitionFunctionTest.java
+++ b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/OffsetsByPartitionFunctionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/ReplicaByPartitionFunctionTest.java b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/ReplicaByPartitionFunctionTest.java
index dbd07fb..f2dce68 100644
--- a/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/ReplicaByPartitionFunctionTest.java
+++ b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/ReplicaByPartitionFunctionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/RetentionByTopicFunctionTest.java b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/RetentionByTopicFunctionTest.java
index 9af739b..b5a5132 100644
--- a/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/RetentionByTopicFunctionTest.java
+++ b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/RetentionByTopicFunctionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/SizeByPartitionFunctionTest.java b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/SizeByPartitionFunctionTest.java
index 7ca900b..12155c1 100644
--- a/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/SizeByPartitionFunctionTest.java
+++ b/monitoring/weigh-bridge/src/test/java/com/hotels/road/weighbridge/function/SizeByPartitionFunctionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/test/resources/hazelcast.xml b/monitoring/weigh-bridge/src/test/resources/hazelcast.xml
index 59ad1d5..64e774b 100644
--- a/monitoring/weigh-bridge/src/test/resources/hazelcast.xml
+++ b/monitoring/weigh-bridge/src/test/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/monitoring/weigh-bridge/src/test/resources/logback-test.xml b/monitoring/weigh-bridge/src/test/resources/logback-test.xml
index d912de1..dc6498c 100644
--- a/monitoring/weigh-bridge/src/test/resources/logback-test.xml
+++ b/monitoring/weigh-bridge/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/pom.xml b/pom.xml
index c0fabef..83da52b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.hotels</groupId>
     <artifactId>hotels-oss-parent</artifactId>
-    <version>2.3.1</version>
+    <version>4.0.1</version>
   </parent>
 
   <groupId>com.hotels.road</groupId>
diff --git a/test/endpoints-tests/src/test/java/com/hotels/road/rest/app/RoadEndpointsIntegrationTest.java b/test/endpoints-tests/src/test/java/com/hotels/road/rest/app/RoadEndpointsIntegrationTest.java
index b979c23..fdc8a1c 100644
--- a/test/endpoints-tests/src/test/java/com/hotels/road/rest/app/RoadEndpointsIntegrationTest.java
+++ b/test/endpoints-tests/src/test/java/com/hotels/road/rest/app/RoadEndpointsIntegrationTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/test/endpoints-tests/src/test/resources/logback-test.xml b/test/endpoints-tests/src/test/resources/logback-test.xml
index be3e1f3..6d9638c 100644
--- a/test/endpoints-tests/src/test/resources/logback-test.xml
+++ b/test/endpoints-tests/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/test/test-drive/src/main/java/com/hotels/road/testdrive/HttpsURLConnectionTrust.java b/test/test-drive/src/main/java/com/hotels/road/testdrive/HttpsURLConnectionTrust.java
index 7c62ac5..5989a18 100644
--- a/test/test-drive/src/main/java/com/hotels/road/testdrive/HttpsURLConnectionTrust.java
+++ b/test/test-drive/src/main/java/com/hotels/road/testdrive/HttpsURLConnectionTrust.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/test/test-drive/src/main/java/com/hotels/road/testdrive/MemoryOnramp.java b/test/test-drive/src/main/java/com/hotels/road/testdrive/MemoryOnramp.java
index 86d6c98..d14bbde 100644
--- a/test/test-drive/src/main/java/com/hotels/road/testdrive/MemoryOnramp.java
+++ b/test/test-drive/src/main/java/com/hotels/road/testdrive/MemoryOnramp.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/test/test-drive/src/main/java/com/hotels/road/testdrive/MemoryOnrampService.java b/test/test-drive/src/main/java/com/hotels/road/testdrive/MemoryOnrampService.java
index 6c5d61f..061b721 100644
--- a/test/test-drive/src/main/java/com/hotels/road/testdrive/MemoryOnrampService.java
+++ b/test/test-drive/src/main/java/com/hotels/road/testdrive/MemoryOnrampService.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/test/test-drive/src/main/java/com/hotels/road/testdrive/MemoryRoadAdminClient.java b/test/test-drive/src/main/java/com/hotels/road/testdrive/MemoryRoadAdminClient.java
index 44585f0..d3d671d 100644
--- a/test/test-drive/src/main/java/com/hotels/road/testdrive/MemoryRoadAdminClient.java
+++ b/test/test-drive/src/main/java/com/hotels/road/testdrive/MemoryRoadAdminClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/test/test-drive/src/main/java/com/hotels/road/testdrive/MemoryRoadConsumer.java b/test/test-drive/src/main/java/com/hotels/road/testdrive/MemoryRoadConsumer.java
index bbe4389..bf05158 100644
--- a/test/test-drive/src/main/java/com/hotels/road/testdrive/MemoryRoadConsumer.java
+++ b/test/test-drive/src/main/java/com/hotels/road/testdrive/MemoryRoadConsumer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/test/test-drive/src/main/java/com/hotels/road/testdrive/MemorySchemaStoreClient.java b/test/test-drive/src/main/java/com/hotels/road/testdrive/MemorySchemaStoreClient.java
index 464e573..2ec6ddf 100644
--- a/test/test-drive/src/main/java/com/hotels/road/testdrive/MemorySchemaStoreClient.java
+++ b/test/test-drive/src/main/java/com/hotels/road/testdrive/MemorySchemaStoreClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/test/test-drive/src/main/java/com/hotels/road/testdrive/NullHiveDestinationAdminClient.java b/test/test-drive/src/main/java/com/hotels/road/testdrive/NullHiveDestinationAdminClient.java
index 045f11c..3f79b72 100644
--- a/test/test-drive/src/main/java/com/hotels/road/testdrive/NullHiveDestinationAdminClient.java
+++ b/test/test-drive/src/main/java/com/hotels/road/testdrive/NullHiveDestinationAdminClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/test/test-drive/src/main/java/com/hotels/road/testdrive/PaverClient.java b/test/test-drive/src/main/java/com/hotels/road/testdrive/PaverClient.java
index 50b0ecf..da6fda4 100644
--- a/test/test-drive/src/main/java/com/hotels/road/testdrive/PaverClient.java
+++ b/test/test-drive/src/main/java/com/hotels/road/testdrive/PaverClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/test/test-drive/src/main/java/com/hotels/road/testdrive/TestDriveApp.java b/test/test-drive/src/main/java/com/hotels/road/testdrive/TestDriveApp.java
index 575b252..6d447dd 100644
--- a/test/test-drive/src/main/java/com/hotels/road/testdrive/TestDriveApp.java
+++ b/test/test-drive/src/main/java/com/hotels/road/testdrive/TestDriveApp.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/test/test-drive/src/main/java/com/hotels/road/testdrive/TestDriveClient.java b/test/test-drive/src/main/java/com/hotels/road/testdrive/TestDriveClient.java
index 425e00d..559221d 100644
--- a/test/test-drive/src/main/java/com/hotels/road/testdrive/TestDriveClient.java
+++ b/test/test-drive/src/main/java/com/hotels/road/testdrive/TestDriveClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/test/test-drive/src/main/java/com/hotels/road/testdrive/TestDriveController.java b/test/test-drive/src/main/java/com/hotels/road/testdrive/TestDriveController.java
index 94c5595..294473b 100644
--- a/test/test-drive/src/main/java/com/hotels/road/testdrive/TestDriveController.java
+++ b/test/test-drive/src/main/java/com/hotels/road/testdrive/TestDriveController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/test/test-drive/src/main/java/com/hotels/road/testdrive/TestDriveSwaggerConfiguration.java b/test/test-drive/src/main/java/com/hotels/road/testdrive/TestDriveSwaggerConfiguration.java
index 67dd879..b1149f7 100644
--- a/test/test-drive/src/main/java/com/hotels/road/testdrive/TestDriveSwaggerConfiguration.java
+++ b/test/test-drive/src/main/java/com/hotels/road/testdrive/TestDriveSwaggerConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/test/test-drive/src/test/java/com/hotels/road/testdrive/TestDriveAppTest.java b/test/test-drive/src/test/java/com/hotels/road/testdrive/TestDriveAppTest.java
index cabe6ac..4b5701f 100644
--- a/test/test-drive/src/test/java/com/hotels/road/testdrive/TestDriveAppTest.java
+++ b/test/test-drive/src/test/java/com/hotels/road/testdrive/TestDriveAppTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/test/test-drive/src/test/java/com/hotels/road/testdrive/TestDriveClientTest.java b/test/test-drive/src/test/java/com/hotels/road/testdrive/TestDriveClientTest.java
index 4d22b5b..5c4f198 100644
--- a/test/test-drive/src/test/java/com/hotels/road/testdrive/TestDriveClientTest.java
+++ b/test/test-drive/src/test/java/com/hotels/road/testdrive/TestDriveClientTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/test/test-drive/src/test/java/com/hotels/road/testdrive/TestDriveControllerTest.java b/test/test-drive/src/test/java/com/hotels/road/testdrive/TestDriveControllerTest.java
index d7c5df5..1de44b9 100644
--- a/test/test-drive/src/test/java/com/hotels/road/testdrive/TestDriveControllerTest.java
+++ b/test/test-drive/src/test/java/com/hotels/road/testdrive/TestDriveControllerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/test/test-drive/src/test/resources/logback-test.xml b/test/test-drive/src/test/resources/logback-test.xml
index 407edd2..1e16442 100644
--- a/test/test-drive/src/test/resources/logback-test.xml
+++ b/test/test-drive/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, 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/tool/cli/bin/data-highway-console-offramp.sh b/tool/cli/bin/data-highway-console-offramp.sh
index 4538322..74ba424 100755
--- a/tool/cli/bin/data-highway-console-offramp.sh
+++ b/tool/cli/bin/data-highway-console-offramp.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2016-2019 Expedia Inc.
+# Copyright (C) 2016-2019 Expedia, 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/tool/cli/bin/data-highway-run-class.sh b/tool/cli/bin/data-highway-run-class.sh
index b355a17..6f62a9a 100755
--- a/tool/cli/bin/data-highway-run-class.sh
+++ b/tool/cli/bin/data-highway-run-class.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2016-2019 Expedia Inc.
+# Copyright (C) 2016-2019 Expedia, 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/tool/cli/src/main/java/com/hotels/road/tool/cli/OfframpConsole.java b/tool/cli/src/main/java/com/hotels/road/tool/cli/OfframpConsole.java
index 55e2786..4924b85 100644
--- a/tool/cli/src/main/java/com/hotels/road/tool/cli/OfframpConsole.java
+++ b/tool/cli/src/main/java/com/hotels/road/tool/cli/OfframpConsole.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/tool/cli/src/test/java/com/hotels/road/tool/cli/OfframpConsoleTest.java b/tool/cli/src/test/java/com/hotels/road/tool/cli/OfframpConsoleTest.java
index c07924f..01bf04e 100644
--- a/tool/cli/src/test/java/com/hotels/road/tool/cli/OfframpConsoleTest.java
+++ b/tool/cli/src/test/java/com/hotels/road/tool/cli/OfframpConsoleTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/tool/cli/src/test/java/com/hotels/road/tool/cli/integration/OfframpConsoleIntegrationTest.java b/tool/cli/src/test/java/com/hotels/road/tool/cli/integration/OfframpConsoleIntegrationTest.java
index 57212c8..791cd03 100644
--- a/tool/cli/src/test/java/com/hotels/road/tool/cli/integration/OfframpConsoleIntegrationTest.java
+++ b/tool/cli/src/test/java/com/hotels/road/tool/cli/integration/OfframpConsoleIntegrationTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/tool/cli/src/test/java/com/hotels/road/tool/cli/integration/TestMessage.java b/tool/cli/src/test/java/com/hotels/road/tool/cli/integration/TestMessage.java
index e9bbcd6..195d270 100644
--- a/tool/cli/src/test/java/com/hotels/road/tool/cli/integration/TestMessage.java
+++ b/tool/cli/src/test/java/com/hotels/road/tool/cli/integration/TestMessage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, 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/tool/cli/src/test/java/com/hotels/road/tool/cli/integration/WebSocketHandlerTest.java b/tool/cli/src/test/java/com/hotels/road/tool/cli/integration/WebSocketHandlerTest.java
index ff7bb53..fc65aa4 100644
--- a/tool/cli/src/test/java/com/hotels/road/tool/cli/integration/WebSocketHandlerTest.java
+++ b/tool/cli/src/test/java/com/hotels/road/tool/cli/integration/WebSocketHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.hotels.road.tool.cli.integration;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
diff --git a/tool/cli/src/test/java/com/hotels/road/tool/cli/integration/WebSocketTestConfiguration.java b/tool/cli/src/test/java/com/hotels/road/tool/cli/integration/WebSocketTestConfiguration.java
index 55e4692..c62d7a1 100644
--- a/tool/cli/src/test/java/com/hotels/road/tool/cli/integration/WebSocketTestConfiguration.java
+++ b/tool/cli/src/test/java/com/hotels/road/tool/cli/integration/WebSocketTestConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 Expedia Inc.
+ * Copyright (C) 2016-2019 Expedia, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.hotels.road.tool.cli.integration;
 
 import org.springframework.context.annotation.Bean;
diff --git a/tool/cli/src/test/resources/logback-test.xml b/tool/cli/src/test/resources/logback-test.xml
index 09a298e..b72d984 100644
--- a/tool/cli/src/test/resources/logback-test.xml
+++ b/tool/cli/src/test/resources/logback-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2016-2019 Expedia Inc.
+  Copyright (C) 2016-2019 Expedia, Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.