diff --git a/modules/distribution/src/core/conf/analytics/analytics-data-config.xml b/modules/distribution/src/core/conf/analytics/analytics-data-config.xml
index 85f9d642..2159490a 100644
--- a/modules/distribution/src/core/conf/analytics/analytics-data-config.xml
+++ b/modules/distribution/src/core/conf/analytics/analytics-data-config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
 ~
 ~ WSO2 Inc. licenses this file to you under the Apache License,
 ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/conf/axis2/axis2.xml b/modules/distribution/src/core/conf/axis2/axis2.xml
index 64bd8ab5..0327c780 100644
--- a/modules/distribution/src/core/conf/axis2/axis2.xml
+++ b/modules/distribution/src/core/conf/axis2/axis2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  ~  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
+  ~  Copyright (c) 2005-2017, WSO2 Inc. (http://wso2.com) All Rights Reserved.
   ~
   ~  WSO2 Inc. licenses this file to you under the Apache License,
   ~  Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/conf/axis2/axis2_client.xml b/modules/distribution/src/core/conf/axis2/axis2_client.xml
index 5c407556..dfa36274 100644
--- a/modules/distribution/src/core/conf/axis2/axis2_client.xml
+++ b/modules/distribution/src/core/conf/axis2/axis2_client.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/conf/datasources/cdm-datasources.xml b/modules/distribution/src/core/conf/datasources/cdm-datasources.xml
index d8d4834e..8a4bb660 100755
--- a/modules/distribution/src/core/conf/datasources/cdm-datasources.xml
+++ b/modules/distribution/src/core/conf/datasources/cdm-datasources.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/conf/datasources/master-datasources.xml b/modules/distribution/src/core/conf/datasources/master-datasources.xml
index d7d5a8b1..0ce0ba70 100755
--- a/modules/distribution/src/core/conf/datasources/master-datasources.xml
+++ b/modules/distribution/src/core/conf/datasources/master-datasources.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/conf/etc/device-analytics-config.xml b/modules/distribution/src/core/conf/etc/device-analytics-config.xml
index 9f2ca7f4..7ca81c59 100644
--- a/modules/distribution/src/core/conf/etc/device-analytics-config.xml
+++ b/modules/distribution/src/core/conf/etc/device-analytics-config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/conf/etc/webapp-publisher-config.xml b/modules/distribution/src/core/conf/etc/webapp-publisher-config.xml
index 4762c6e8..d34fb3da 100644
--- a/modules/distribution/src/core/conf/etc/webapp-publisher-config.xml
+++ b/modules/distribution/src/core/conf/etc/webapp-publisher-config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/conf/identity/application-authentication.xml b/modules/distribution/src/core/conf/identity/application-authentication.xml
index 873810cf..6f8bcd22 100644
--- a/modules/distribution/src/core/conf/identity/application-authentication.xml
+++ b/modules/distribution/src/core/conf/identity/application-authentication.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
 ~
 ~ Licensed under the Apache License, Version 2.0 (the "License");
 ~ you may not use this file except in compliance with the License.
diff --git a/modules/distribution/src/core/conf/identity/identity-providers/default.xml b/modules/distribution/src/core/conf/identity/identity-providers/default.xml
index 090bd787..90b0d2cf 100644
--- a/modules/distribution/src/core/conf/identity/identity-providers/default.xml
+++ b/modules/distribution/src/core/conf/identity/identity-providers/default.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/conf/identity/identity-providers/iot_default.xml b/modules/distribution/src/core/conf/identity/identity-providers/iot_default.xml
index 98615040..66c6f369 100644
--- a/modules/distribution/src/core/conf/identity/identity-providers/iot_default.xml
+++ b/modules/distribution/src/core/conf/identity/identity-providers/iot_default.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/conf/identity/identity.xml b/modules/distribution/src/core/conf/identity/identity.xml
index 1156d979..d8f62e5f 100644
--- a/modules/distribution/src/core/conf/identity/identity.xml
+++ b/modules/distribution/src/core/conf/identity/identity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-~ Copyright (c) 2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
 ~
 ~ Licensed under the Apache License, Version 2.0 (the "License");
 ~ you may not use this file except in compliance with the License.
diff --git a/modules/distribution/src/core/conf/identity/service-providers/API_STORE.xml b/modules/distribution/src/core/conf/identity/service-providers/API_STORE.xml
index d77e49a3..644fd48e 100644
--- a/modules/distribution/src/core/conf/identity/service-providers/API_STORE.xml
+++ b/modules/distribution/src/core/conf/identity/service-providers/API_STORE.xml
@@ -1,5 +1,5 @@
 <!--
-~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
 ~
 ~ Licensed under the Apache License, Version 2.0 (the "License");
 ~ you may not use this file except in compliance with the License.
diff --git a/modules/distribution/src/core/conf/identity/service-providers/default.xml b/modules/distribution/src/core/conf/identity/service-providers/default.xml
index a619f365..3936524f 100644
--- a/modules/distribution/src/core/conf/identity/service-providers/default.xml
+++ b/modules/distribution/src/core/conf/identity/service-providers/default.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/conf/identity/service-providers/devicemgt.xml b/modules/distribution/src/core/conf/identity/service-providers/devicemgt.xml
index 2c7c52d9..3b993af7 100644
--- a/modules/distribution/src/core/conf/identity/service-providers/devicemgt.xml
+++ b/modules/distribution/src/core/conf/identity/service-providers/devicemgt.xml
@@ -1,5 +1,5 @@
 <!--
-~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
 ~
 ~ Licensed under the Apache License, Version 2.0 (the "License");
 ~ you may not use this file except in compliance with the License.
diff --git a/modules/distribution/src/core/conf/identity/service-providers/portal.xml b/modules/distribution/src/core/conf/identity/service-providers/portal.xml
index 3cd65666..e6ada3a0 100644
--- a/modules/distribution/src/core/conf/identity/service-providers/portal.xml
+++ b/modules/distribution/src/core/conf/identity/service-providers/portal.xml
@@ -1,5 +1,5 @@
 <!--
-~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
 ~
 ~ Licensed under the Apache License, Version 2.0 (the "License");
 ~ you may not use this file except in compliance with the License.
diff --git a/modules/distribution/src/core/conf/identity/service-providers/publisher.xml b/modules/distribution/src/core/conf/identity/service-providers/publisher.xml
index 33a4736d..8cc85113 100644
--- a/modules/distribution/src/core/conf/identity/service-providers/publisher.xml
+++ b/modules/distribution/src/core/conf/identity/service-providers/publisher.xml
@@ -1,5 +1,5 @@
 <!--
-~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
 ~
 ~ Licensed under the Apache License, Version 2.0 (the "License");
 ~ you may not use this file except in compliance with the License.
diff --git a/modules/distribution/src/core/conf/identity/service-providers/sp_cdm.xml b/modules/distribution/src/core/conf/identity/service-providers/sp_cdm.xml
index 40d61237..57b1f5e0 100644
--- a/modules/distribution/src/core/conf/identity/service-providers/sp_cdm.xml
+++ b/modules/distribution/src/core/conf/identity/service-providers/sp_cdm.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/conf/identity/service-providers/sp_mdm.xml b/modules/distribution/src/core/conf/identity/service-providers/sp_mdm.xml
index e85c3f4d..0c08d88e 100644
--- a/modules/distribution/src/core/conf/identity/service-providers/sp_mdm.xml
+++ b/modules/distribution/src/core/conf/identity/service-providers/sp_mdm.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/conf/identity/service-providers/store.xml b/modules/distribution/src/core/conf/identity/service-providers/store.xml
index 9503a87d..0e42e46b 100644
--- a/modules/distribution/src/core/conf/identity/service-providers/store.xml
+++ b/modules/distribution/src/core/conf/identity/service-providers/store.xml
@@ -1,5 +1,5 @@
 <!--
-~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
 ~
 ~ Licensed under the Apache License, Version 2.0 (the "License");
 ~ you may not use this file except in compliance with the License.
diff --git a/modules/distribution/src/core/conf/identity/sso-idp-config.xml b/modules/distribution/src/core/conf/identity/sso-idp-config.xml
index fb00571f..9e74221e 100755
--- a/modules/distribution/src/core/conf/identity/sso-idp-config.xml
+++ b/modules/distribution/src/core/conf/identity/sso-idp-config.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2016, WSO2 Inc. (http:www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2017, WSO2 Inc. (http:www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/conf/license-config.xml b/modules/distribution/src/core/conf/license-config.xml
index 0310f314..6036b086 100644
--- a/modules/distribution/src/core/conf/license-config.xml
+++ b/modules/distribution/src/core/conf/license-config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~
-  ~   Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~   Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~   WSO2 Inc. licenses this file to you under the Apache License,
   ~   Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/conf/registry.xml b/modules/distribution/src/core/conf/registry.xml
index 20787e99..8b311ba4 100644
--- a/modules/distribution/src/core/conf/registry.xml
+++ b/modules/distribution/src/core/conf/registry.xml
@@ -2,7 +2,7 @@
 
 
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http:www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2017, WSO2 Inc. (http:www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/conf/security/application-authenticators.xml b/modules/distribution/src/core/conf/security/application-authenticators.xml
index c13c0401..1576ee00 100755
--- a/modules/distribution/src/core/conf/security/application-authenticators.xml
+++ b/modules/distribution/src/core/conf/security/application-authenticators.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!--
-  ~ Copyright 2005-2013 WSO2, Inc. (http://wso2.com)
+  ~ Copyright 2005-2017 WSO2 Inc. (http://wso2.com)
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/modules/distribution/src/core/conf/security/authenticators.xml b/modules/distribution/src/core/conf/security/authenticators.xml
index 0f9130b9..6de692ed 100644
--- a/modules/distribution/src/core/conf/security/authenticators.xml
+++ b/modules/distribution/src/core/conf/security/authenticators.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!--
-  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/conf/synapse-handlers.xml b/modules/distribution/src/core/conf/synapse-handlers.xml
index b1291943..21595f6d 100644
--- a/modules/distribution/src/core/conf/synapse-handlers.xml
+++ b/modules/distribution/src/core/conf/synapse-handlers.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/conf/tomcat/context.xml b/modules/distribution/src/core/conf/tomcat/context.xml
index 6bbf7097..03e79b17 100644
--- a/modules/distribution/src/core/conf/tomcat/context.xml
+++ b/modules/distribution/src/core/conf/tomcat/context.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/conf/tomcat/webapp-classloading-environments.xml b/modules/distribution/src/core/conf/tomcat/webapp-classloading-environments.xml
index d1f5ecc0..e20f8bde 100644
--- a/modules/distribution/src/core/conf/tomcat/webapp-classloading-environments.xml
+++ b/modules/distribution/src/core/conf/tomcat/webapp-classloading-environments.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!--
-  ~ Copyright 2005-2013 WSO2, Inc. (http://wso2.com)
+  ~ Copyright 2005-2017 WSO2 Inc. (http://wso2.com)
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/modules/distribution/src/core/conf/user-mgt.xml b/modules/distribution/src/core/conf/user-mgt.xml
index 8a9afc53..ededf147 100644
--- a/modules/distribution/src/core/conf/user-mgt.xml
+++ b/modules/distribution/src/core/conf/user-mgt.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright WSO2, Inc. (http://wso2.com)
+  ~ Copyright WSO2 Inc. (http://wso2.com)
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml b/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
index 979eaf69..28f0dc98 100644
--- a/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
+++ b/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/modules/distribution/src/core/samples/device-plugins-deployer.xml b/modules/distribution/src/core/samples/device-plugins-deployer.xml
index 2838ef99..a834cd8d 100644
--- a/modules/distribution/src/core/samples/device-plugins-deployer.xml
+++ b/modules/distribution/src/core/samples/device-plugins-deployer.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except