diff --git a/.travis.yml b/.travis.yml
index f54a520..a122ebf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@
 - cd incubator-s4
 - git checkout tags/0.6.0-Final
 - mv ../bin/s4-build/gradlew .
-- wget http://people.apache.org/~gdfm/gradle-wrapper-1.4.jar 
+- wget http://people.apache.org/~gdfm/gradle-wrapper-1.4.jar
 - mv gradle-wrapper-1.4.jar ./lib/
 - mv ../bin/s4-build/gradle-wrapper-1.4.properties ./lib/
 - ./gradlew install
diff --git a/NOTICE b/NOTICE
index 31313d4..8b95f08 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,11 +1,11 @@
 Apache SAMOA (incubating)
-Copyright (C) 2014-2015 The Apache Software Foundation.
+Copyright (C) 2014-2015 Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 This product includes software developed at Yahoo! Inc. (www.yahoo.com)
-Copyright (c) 2013-2014 Yahoo! Inc.
+Copyright (C) 2013-2014 Yahoo! Inc.
 
 This product bundles MOA version 13.08 (redistributed under the Apache License v2 with consent of the copyright holders).
 Copyright (C) 2007 University of Waikato. Library for data stream mining.
diff --git a/README.md b/README.md
index c76174a..a2f3fd1 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 2014-2015 The Apache Software Foundation
+ Copyright (c) 2014-2015 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/pom.xml b/pom.xml
index b1c21d5..f000d58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -211,7 +211,7 @@
                 <configuration>
                     <licenseName>apache_v2</licenseName>
                     <inceptionYear>2014</inceptionYear>
-                    <organizationName>The Apache Software Foundation</organizationName>
+                    <organizationName>Apache Software Foundation</organizationName>
                     <projectName>SAMOA</projectName>
                     <roots>
                         <root>samoa-api</root>
diff --git a/samoa-api/src/main/java/org/apache/samoa/core/Globals.java b/samoa-api/src/main/java/org/apache/samoa/core/Globals.java
index de9fa70..bbfd617 100644
--- a/samoa-api/src/main/java/org/apache/samoa/core/Globals.java
+++ b/samoa-api/src/main/java/org/apache/samoa/core/Globals.java
@@ -38,7 +38,7 @@
 
   public static final String versionString = "0.3.0-incubating";
 
-  public static final String copyrightNotice = "Copyright 2014-2015 The Apache Software Foundation";
+  public static final String copyrightNotice = "Copyright 2014-2015 Apache Software Foundation";
 
   public static final String webAddress = "http://samoa.incubator.apache.org";
 
diff --git a/samoa-api/src/main/java/org/apache/samoa/learners/classifiers/rules/common/TargetMean.java b/samoa-api/src/main/java/org/apache/samoa/learners/classifiers/rules/common/TargetMean.java
index a76d85b..1d80a02 100644
--- a/samoa-api/src/main/java/org/apache/samoa/learners/classifiers/rules/common/TargetMean.java
+++ b/samoa-api/src/main/java/org/apache/samoa/learners/classifiers/rules/common/TargetMean.java
@@ -1,6 +1,6 @@
 /*
  *    TargetMean.java
- *    Copyright (C) 2014 University of Porto, Portugal
+ *    Copyright (C) 2014 - 2015 Apache Software Foundation
  *    @author  J. Duarte, A. Bifet, J. Gama
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/samoa-api/src/main/java/org/apache/samoa/moa/classifiers/rules/core/conditionaltests/NumericAttributeBinaryRulePredicate.java b/samoa-api/src/main/java/org/apache/samoa/moa/classifiers/rules/core/conditionaltests/NumericAttributeBinaryRulePredicate.java
index 9124fb8..a2b04bd 100644
--- a/samoa-api/src/main/java/org/apache/samoa/moa/classifiers/rules/core/conditionaltests/NumericAttributeBinaryRulePredicate.java
+++ b/samoa-api/src/main/java/org/apache/samoa/moa/classifiers/rules/core/conditionaltests/NumericAttributeBinaryRulePredicate.java
@@ -20,7 +20,7 @@
 
 /*
  *    NumericAttributeBinaryRulePredicate.java
- *    Copyright (C) 2013 University of Porto, Portugal
+ *    Copyright (C) 2014 - 2015 Apache Software Foundation
  *    @author E. Almeida, A. Carvalho, J. Gama
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/samoa-api/src/main/java/org/apache/samoa/moa/classifiers/rules/core/splitcriteria/SDRSplitCriterionAMRules.java b/samoa-api/src/main/java/org/apache/samoa/moa/classifiers/rules/core/splitcriteria/SDRSplitCriterionAMRules.java
index 34b33bc..bde0bda 100644
--- a/samoa-api/src/main/java/org/apache/samoa/moa/classifiers/rules/core/splitcriteria/SDRSplitCriterionAMRules.java
+++ b/samoa-api/src/main/java/org/apache/samoa/moa/classifiers/rules/core/splitcriteria/SDRSplitCriterionAMRules.java
@@ -22,7 +22,7 @@
 
 /*
  *    SDRSplitCriterionAMRules.java
- *    Copyright (C) 2014 University of Porto, Portugal
+ *    Copyright (C) 2014 - 2015 Apache Software Foundation
  *    @author A. Bifet, J. Duarte, J. Gama
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");