diff --git a/LICENSE b/LICENSE
index 4af4110272c8790bb40ee8059a63dc38b4411e44..d20c9c31898488284af0b0dc40d0c9917f5b6905 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2016, The JastAdd Team
+Copyright (c) 2005-2020, The JastAdd Team
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/README.md b/README.md
index aec382e259f71a5b8c6c2634aec8d5ccba791ec1..21d4877bd7b0038e356daf876d3fffad6cf8f5d1 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ For additional contributors, see the change logs.
 
 ## License
 
-Copyright (c) 2005-2016, The JastAdd Team. All rights reserved.
+Copyright (c) 2005-2020, The JastAdd Team. All rights reserved.
 
 JastAdd2 is covered by the modified BSD License. For the full license text
 see the LICENSE file.
diff --git a/src/jastadd/ast/CollectionAttributes.jrag b/src/jastadd/ast/CollectionAttributes.jrag
index 28ba15e93bc9f79823243cf6186815b421aef09b..928c6bd556a10b5cfbe1ba97ea403a38c9eafd7f 100644
--- a/src/jastadd/ast/CollectionAttributes.jrag
+++ b/src/jastadd/ast/CollectionAttributes.jrag
@@ -283,7 +283,7 @@ aspect CollectionAttributes {
       CollDecl decl = grammar.lookupCollDecl(collHost, collName);
       if (decl == null) {
         throw new Error(String.format(
-              "%s:%d: Can not add custom survey code for unknown collection attribute: %s.%s()",
+              "%s:%d: Cannot add custom survey code for unknown collection attribute: %s.%s()",
               fileName, startLine, collHost, collName));
       }
       return decl;
@@ -593,7 +593,7 @@ aspect CollectionAttributes {
       // TODO(joqvist): defer collection attribute weaving.
       ((TypeDecl) c).addCollDecl(decl);
     } else {
-      errorf("Can not add collection attribute %s %s to unknown class %s in %s at line %d",
+      errorf("Cannot add collection attribute %s %s to unknown class %s in %s at line %d",
           type, name, className, fileName, startLine);
     }
   }
@@ -651,7 +651,7 @@ aspect CollectionAttributes {
         errorf("annotation %s not allowed for custom survey blocks.", annotation);
       }
     } else {
-      errorf("Can not add custom collection survey code to unknown class %s in %s at line %d",
+      errorf("Cannot add custom collection survey code to unknown class %s in %s at line %d",
           nodeType, fileName, startLine);
     }
   }
@@ -685,7 +685,7 @@ aspect CollectionAttributes {
         errorf("annotation %s not allowed for custom survey blocks.", annotation);
       }
     } else {
-      errorf("Can not add custom collection survey code to unknown class %s in %s at line %d",
+      errorf("Cannot add custom collection survey code to unknown class %s in %s at line %d",
           nodeType, fileName, startLine);
     }
   }
@@ -721,7 +721,7 @@ aspect CollectionAttributes {
       ((ASTDecl) type).addCollEq(equ);
       return equ;
     } else {
-      errorf("Can not add collection contribution to unknown class %s in %s at line %d",
+      errorf("Cannot add collection contribution to unknown class %s in %s at line %d",
           nodeType, fileName, startLine);
       // TODO(joqvist): defer weaving so we can return non-null.
       return null;
diff --git a/src/java/org/jastadd/JastAdd.java b/src/java/org/jastadd/JastAdd.java
index a0c526d6a8465a98db59af3ebb1febf571f586a0..bb0cc2e8274c18dbabdb39e3f56b267267946f19 100644
--- a/src/java/org/jastadd/JastAdd.java
+++ b/src/java/org/jastadd/JastAdd.java
@@ -139,7 +139,7 @@ public class JastAdd {
     if (config.shouldPrintVersion()) {
       out.println(getVersionString());
       out.println(getBuildTimestamp());
-      out.println("Copyright (c) 2005-2015, The JastAdd Team. All rights reserved.");
+      out.println("Copyright (c) 2005-2020, The JastAdd Team. All rights reserved.");
       out.println("This software is covered by the modified BSD license.");
       return 0;
     } else if (config.shouldPrintHelp()) {