Updating copyright information
diff --git a/README.md b/README.md
index bc0bed9..0fc6ed8 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-# Mifos I/O Core Lang
+# Apache Fineract CN Core Lang
 
 [![Join the chat at https://gitter.im/mifos-initiative/mifos.io](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mifos-initiative/mifos.io?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ## Abstract
-Mifos I/O is an application framework for digital financial services, a system to support nationwide and cross-national financial transactions and help to level and speed the creation of an inclusive, interconnected digital economy for every nation in the world.
+Apache Fineract CN is an application framework for digital financial services, a system to support nationwide and cross-national financial transactions and help to level and speed the creation of an inclusive, interconnected digital economy for every nation in the world.
 
 ## Prerequisites
 ### Runtime
diff --git a/build.gradle b/build.gradle
index 96d9e83..cc2a80f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -78,32 +78,11 @@
     }
 }
 
-bintray {
-    user = System.getenv('BINTRAY_USER')
-    key = System.getenv('BINTRAY_KEY')
-    pkg {
-        repo = 'mifosio'
-        userOrg = 'kuelap'
-        name = "${project.group}.${project.name}"
-        licenses = ['Apache-2.0']
-        vcsUrl = 'https://github.com/mifosio/lang.git'
-        version {
-            name = project.version
-            desc = 'build snapshot'
-            released  = new Date()
-            attributes = ['changesetId': changesetId]
-        }
-    }
-    publications = ['langPublication']
-}
-
 license {
     header rootProject.file('HEADER')
-    strictCheck true
     mapping {
         java = 'SLASHSTAR_STYLE'
     }
     ext.year = Calendar.getInstance().get(Calendar.YEAR)
-    ext.name = 'Kuelap, Inc'
-    skipExistingHeaders true
+    ext.name = 'The Apache Software Foundation'
 }
diff --git a/src/main/java/io/mifos/core/lang/ApplicationName.java b/src/main/java/io/mifos/core/lang/ApplicationName.java
index c3da900..9bac88b 100644
--- a/src/main/java/io/mifos/core/lang/ApplicationName.java
+++ b/src/main/java/io/mifos/core/lang/ApplicationName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/AutoTenantContext.java b/src/main/java/io/mifos/core/lang/AutoTenantContext.java
index 6057014..efab418 100644
--- a/src/main/java/io/mifos/core/lang/AutoTenantContext.java
+++ b/src/main/java/io/mifos/core/lang/AutoTenantContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/DateConverter.java b/src/main/java/io/mifos/core/lang/DateConverter.java
index 6e895de..271582d 100644
--- a/src/main/java/io/mifos/core/lang/DateConverter.java
+++ b/src/main/java/io/mifos/core/lang/DateConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/DateOfBirth.java b/src/main/java/io/mifos/core/lang/DateOfBirth.java
index 31faeb3..b15c22a 100644
--- a/src/main/java/io/mifos/core/lang/DateOfBirth.java
+++ b/src/main/java/io/mifos/core/lang/DateOfBirth.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/DateRange.java b/src/main/java/io/mifos/core/lang/DateRange.java
index 5a54687..9b7613a 100644
--- a/src/main/java/io/mifos/core/lang/DateRange.java
+++ b/src/main/java/io/mifos/core/lang/DateRange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/ServiceError.java b/src/main/java/io/mifos/core/lang/ServiceError.java
index 1fdf297..11b8af1 100644
--- a/src/main/java/io/mifos/core/lang/ServiceError.java
+++ b/src/main/java/io/mifos/core/lang/ServiceError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/ServiceException.java b/src/main/java/io/mifos/core/lang/ServiceException.java
index acfe537..15e74db 100644
--- a/src/main/java/io/mifos/core/lang/ServiceException.java
+++ b/src/main/java/io/mifos/core/lang/ServiceException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/TenantContextHolder.java b/src/main/java/io/mifos/core/lang/TenantContextHolder.java
index d9abd9f..be36f53 100644
--- a/src/main/java/io/mifos/core/lang/TenantContextHolder.java
+++ b/src/main/java/io/mifos/core/lang/TenantContextHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/config/ApplicationNameConfiguration.java b/src/main/java/io/mifos/core/lang/config/ApplicationNameConfiguration.java
index ed0f391..4870953 100644
--- a/src/main/java/io/mifos/core/lang/config/ApplicationNameConfiguration.java
+++ b/src/main/java/io/mifos/core/lang/config/ApplicationNameConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/config/EnableApplicationName.java b/src/main/java/io/mifos/core/lang/config/EnableApplicationName.java
index 71a0dea..f4f2d6c 100644
--- a/src/main/java/io/mifos/core/lang/config/EnableApplicationName.java
+++ b/src/main/java/io/mifos/core/lang/config/EnableApplicationName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/config/EnableServiceException.java b/src/main/java/io/mifos/core/lang/config/EnableServiceException.java
index 380c901..bffcf2b 100644
--- a/src/main/java/io/mifos/core/lang/config/EnableServiceException.java
+++ b/src/main/java/io/mifos/core/lang/config/EnableServiceException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/config/EnableTenantContext.java b/src/main/java/io/mifos/core/lang/config/EnableTenantContext.java
index 2850de4..1799e53 100644
--- a/src/main/java/io/mifos/core/lang/config/EnableTenantContext.java
+++ b/src/main/java/io/mifos/core/lang/config/EnableTenantContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/config/ServiceExceptionFilter.java b/src/main/java/io/mifos/core/lang/config/ServiceExceptionFilter.java
index 08af6a8..08255e5 100644
--- a/src/main/java/io/mifos/core/lang/config/ServiceExceptionFilter.java
+++ b/src/main/java/io/mifos/core/lang/config/ServiceExceptionFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/config/ServiceExceptionJavaConfiguration.java b/src/main/java/io/mifos/core/lang/config/ServiceExceptionJavaConfiguration.java
index 2c03e04..9293829 100644
--- a/src/main/java/io/mifos/core/lang/config/ServiceExceptionJavaConfiguration.java
+++ b/src/main/java/io/mifos/core/lang/config/ServiceExceptionJavaConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/config/TenantContextJavaConfiguration.java b/src/main/java/io/mifos/core/lang/config/TenantContextJavaConfiguration.java
index e977370..5bfb1f6 100644
--- a/src/main/java/io/mifos/core/lang/config/TenantContextJavaConfiguration.java
+++ b/src/main/java/io/mifos/core/lang/config/TenantContextJavaConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/config/TenantHeaderFilter.java b/src/main/java/io/mifos/core/lang/config/TenantHeaderFilter.java
index a9b2736..fcbaaae 100644
--- a/src/main/java/io/mifos/core/lang/config/TenantHeaderFilter.java
+++ b/src/main/java/io/mifos/core/lang/config/TenantHeaderFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/listening/EventExpectation.java b/src/main/java/io/mifos/core/lang/listening/EventExpectation.java
index 1e6f248..b88e980 100644
--- a/src/main/java/io/mifos/core/lang/listening/EventExpectation.java
+++ b/src/main/java/io/mifos/core/lang/listening/EventExpectation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Kuelap, Inc
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/listening/EventKey.java b/src/main/java/io/mifos/core/lang/listening/EventKey.java
index 9026288..43c1abe 100644
--- a/src/main/java/io/mifos/core/lang/listening/EventKey.java
+++ b/src/main/java/io/mifos/core/lang/listening/EventKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Kuelap, Inc
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/listening/TenantedEventListener.java b/src/main/java/io/mifos/core/lang/listening/TenantedEventListener.java
index 9993097..32dd776 100644
--- a/src/main/java/io/mifos/core/lang/listening/TenantedEventListener.java
+++ b/src/main/java/io/mifos/core/lang/listening/TenantedEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Kuelap, Inc
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/security/RsaKeyPairFactory.java b/src/main/java/io/mifos/core/lang/security/RsaKeyPairFactory.java
index f385d69..df73e8a 100644
--- a/src/main/java/io/mifos/core/lang/security/RsaKeyPairFactory.java
+++ b/src/main/java/io/mifos/core/lang/security/RsaKeyPairFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/security/RsaPrivateKeyBuilder.java b/src/main/java/io/mifos/core/lang/security/RsaPrivateKeyBuilder.java
index 892865a..035accb 100644
--- a/src/main/java/io/mifos/core/lang/security/RsaPrivateKeyBuilder.java
+++ b/src/main/java/io/mifos/core/lang/security/RsaPrivateKeyBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/security/RsaPublicKeyBuilder.java b/src/main/java/io/mifos/core/lang/security/RsaPublicKeyBuilder.java
index 36c19bc..42d4159 100644
--- a/src/main/java/io/mifos/core/lang/security/RsaPublicKeyBuilder.java
+++ b/src/main/java/io/mifos/core/lang/security/RsaPublicKeyBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/validation/CheckApplicationName.java b/src/main/java/io/mifos/core/lang/validation/CheckApplicationName.java
index 74f9d76..9e24727 100644
--- a/src/main/java/io/mifos/core/lang/validation/CheckApplicationName.java
+++ b/src/main/java/io/mifos/core/lang/validation/CheckApplicationName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/validation/CheckIdentifier.java b/src/main/java/io/mifos/core/lang/validation/CheckIdentifier.java
index 4e54320..7f8843a 100644
--- a/src/main/java/io/mifos/core/lang/validation/CheckIdentifier.java
+++ b/src/main/java/io/mifos/core/lang/validation/CheckIdentifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/validation/CheckIdentifiers.java b/src/main/java/io/mifos/core/lang/validation/CheckIdentifiers.java
index f739eb3..234cf5f 100644
--- a/src/main/java/io/mifos/core/lang/validation/CheckIdentifiers.java
+++ b/src/main/java/io/mifos/core/lang/validation/CheckIdentifiers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/validation/CheckLocalDateTimeString.java b/src/main/java/io/mifos/core/lang/validation/CheckLocalDateTimeString.java
index d771539..53d6707 100644
--- a/src/main/java/io/mifos/core/lang/validation/CheckLocalDateTimeString.java
+++ b/src/main/java/io/mifos/core/lang/validation/CheckLocalDateTimeString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/validation/constraints/ValidApplicationName.java b/src/main/java/io/mifos/core/lang/validation/constraints/ValidApplicationName.java
index a92e34f..61fc560 100644
--- a/src/main/java/io/mifos/core/lang/validation/constraints/ValidApplicationName.java
+++ b/src/main/java/io/mifos/core/lang/validation/constraints/ValidApplicationName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/validation/constraints/ValidIdentifier.java b/src/main/java/io/mifos/core/lang/validation/constraints/ValidIdentifier.java
index 4896c31..33357bb 100644
--- a/src/main/java/io/mifos/core/lang/validation/constraints/ValidIdentifier.java
+++ b/src/main/java/io/mifos/core/lang/validation/constraints/ValidIdentifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/validation/constraints/ValidIdentifiers.java b/src/main/java/io/mifos/core/lang/validation/constraints/ValidIdentifiers.java
index f4b2533..75db607 100644
--- a/src/main/java/io/mifos/core/lang/validation/constraints/ValidIdentifiers.java
+++ b/src/main/java/io/mifos/core/lang/validation/constraints/ValidIdentifiers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/io/mifos/core/lang/validation/constraints/ValidLocalDateTimeString.java b/src/main/java/io/mifos/core/lang/validation/constraints/ValidLocalDateTimeString.java
index 3e42d9e..fe5f0f5 100644
--- a/src/main/java/io/mifos/core/lang/validation/constraints/ValidLocalDateTimeString.java
+++ b/src/main/java/io/mifos/core/lang/validation/constraints/ValidLocalDateTimeString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/mifos/core/lang/ApplicationNameTest.java b/src/test/java/io/mifos/core/lang/ApplicationNameTest.java
index e51abb1..106bfad 100644
--- a/src/test/java/io/mifos/core/lang/ApplicationNameTest.java
+++ b/src/test/java/io/mifos/core/lang/ApplicationNameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/mifos/core/lang/AutoTenantContextTest.java b/src/test/java/io/mifos/core/lang/AutoTenantContextTest.java
index cdaba8c..86137be 100644
--- a/src/test/java/io/mifos/core/lang/AutoTenantContextTest.java
+++ b/src/test/java/io/mifos/core/lang/AutoTenantContextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/mifos/core/lang/DateConverterTest.java b/src/test/java/io/mifos/core/lang/DateConverterTest.java
index 1f9b812..f463566 100644
--- a/src/test/java/io/mifos/core/lang/DateConverterTest.java
+++ b/src/test/java/io/mifos/core/lang/DateConverterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/mifos/core/lang/DateRangeTest.java b/src/test/java/io/mifos/core/lang/DateRangeTest.java
index 39bbe4b..db8aa82 100644
--- a/src/test/java/io/mifos/core/lang/DateRangeTest.java
+++ b/src/test/java/io/mifos/core/lang/DateRangeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/mifos/core/lang/TenantContextHolderTest.java b/src/test/java/io/mifos/core/lang/TenantContextHolderTest.java
index eab945b..53699f9 100644
--- a/src/test/java/io/mifos/core/lang/TenantContextHolderTest.java
+++ b/src/test/java/io/mifos/core/lang/TenantContextHolderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/mifos/core/lang/config/ServiceExceptionFilterTest.java b/src/test/java/io/mifos/core/lang/config/ServiceExceptionFilterTest.java
index edba9a1..3c09c3a 100644
--- a/src/test/java/io/mifos/core/lang/config/ServiceExceptionFilterTest.java
+++ b/src/test/java/io/mifos/core/lang/config/ServiceExceptionFilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/mifos/core/lang/config/TenantHeaderFilterTest.java b/src/test/java/io/mifos/core/lang/config/TenantHeaderFilterTest.java
index 17c3a94..82f287d 100644
--- a/src/test/java/io/mifos/core/lang/config/TenantHeaderFilterTest.java
+++ b/src/test/java/io/mifos/core/lang/config/TenantHeaderFilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/mifos/core/lang/listening/TenantedEventListenerTest.java b/src/test/java/io/mifos/core/lang/listening/TenantedEventListenerTest.java
index ed919c0..32918df 100644
--- a/src/test/java/io/mifos/core/lang/listening/TenantedEventListenerTest.java
+++ b/src/test/java/io/mifos/core/lang/listening/TenantedEventListenerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Kuelap, Inc
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/mifos/core/lang/security/RsaKeyPairFactoryTest.java b/src/test/java/io/mifos/core/lang/security/RsaKeyPairFactoryTest.java
index 41d4fa4..e67f459 100644
--- a/src/test/java/io/mifos/core/lang/security/RsaKeyPairFactoryTest.java
+++ b/src/test/java/io/mifos/core/lang/security/RsaKeyPairFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/mifos/core/lang/security/RsaPrivateKeyBuilderTest.java b/src/test/java/io/mifos/core/lang/security/RsaPrivateKeyBuilderTest.java
index b2a7675..e5c8bc3 100644
--- a/src/test/java/io/mifos/core/lang/security/RsaPrivateKeyBuilderTest.java
+++ b/src/test/java/io/mifos/core/lang/security/RsaPrivateKeyBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/mifos/core/lang/security/RsaPublicKeyBuilderTest.java b/src/test/java/io/mifos/core/lang/security/RsaPublicKeyBuilderTest.java
index 52b7167..d9f9ff5 100644
--- a/src/test/java/io/mifos/core/lang/security/RsaPublicKeyBuilderTest.java
+++ b/src/test/java/io/mifos/core/lang/security/RsaPublicKeyBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/mifos/core/lang/validation/TestHelper.java b/src/test/java/io/mifos/core/lang/validation/TestHelper.java
index fb85f3c..21aa851 100644
--- a/src/test/java/io/mifos/core/lang/validation/TestHelper.java
+++ b/src/test/java/io/mifos/core/lang/validation/TestHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/mifos/core/lang/validation/ValidApplicationNameTest.java b/src/test/java/io/mifos/core/lang/validation/ValidApplicationNameTest.java
index 50481d7..d28bf9c 100644
--- a/src/test/java/io/mifos/core/lang/validation/ValidApplicationNameTest.java
+++ b/src/test/java/io/mifos/core/lang/validation/ValidApplicationNameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/mifos/core/lang/validation/ValidIdentifierTest.java b/src/test/java/io/mifos/core/lang/validation/ValidIdentifierTest.java
index a1ad204..1fa2b8b 100644
--- a/src/test/java/io/mifos/core/lang/validation/ValidIdentifierTest.java
+++ b/src/test/java/io/mifos/core/lang/validation/ValidIdentifierTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/mifos/core/lang/validation/ValidIdentifiersTest.java b/src/test/java/io/mifos/core/lang/validation/ValidIdentifiersTest.java
index 5f110ca..c3180dc 100644
--- a/src/test/java/io/mifos/core/lang/validation/ValidIdentifiersTest.java
+++ b/src/test/java/io/mifos/core/lang/validation/ValidIdentifiersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/io/mifos/core/lang/validation/ValidLocalDateTimeStringTest.java b/src/test/java/io/mifos/core/lang/validation/ValidLocalDateTimeStringTest.java
index 5a46383..ecbf68d 100644
--- a/src/test/java/io/mifos/core/lang/validation/ValidLocalDateTimeStringTest.java
+++ b/src/test/java/io/mifos/core/lang/validation/ValidLocalDateTimeStringTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2018 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.