diff --git a/doc/articles/fromhtmltohtmlviahtml.html b/doc/articles/fromhtmltohtmlviahtml.html
index 9b338db2a..cbd295e2d 100644
--- a/doc/articles/fromhtmltohtmlviahtml.html
+++ b/doc/articles/fromhtmltohtmlviahtml.html
@@ -93,7 +93,7 @@ External links
- Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/doc/articles/layouts.html b/doc/articles/layouts.html
index dce5325c1..c6b7523b2 100644
--- a/doc/articles/layouts.html
+++ b/doc/articles/layouts.html
@@ -422,7 +422,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/doc/articles/petclinic.html b/doc/articles/petclinic.html
index c928b8cfe..d0dcb812c 100644
--- a/doc/articles/petclinic.html
+++ b/doc/articles/petclinic.html
@@ -305,7 +305,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/doc/articles/sayhelloagainextendingthymeleafevenmore5minutes.html b/doc/articles/sayhelloagainextendingthymeleafevenmore5minutes.html
index e04e1aa8e..1cdc70af7 100644
--- a/doc/articles/sayhelloagainextendingthymeleafevenmore5minutes.html
+++ b/doc/articles/sayhelloagainextendingthymeleafevenmore5minutes.html
@@ -230,7 +230,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/doc/articles/sayhelloextendingthymeleaf5minutes.html b/doc/articles/sayhelloextendingthymeleaf5minutes.html
index 654262e33..5b6912ed6 100644
--- a/doc/articles/sayhelloextendingthymeleaf5minutes.html
+++ b/doc/articles/sayhelloextendingthymeleaf5minutes.html
@@ -155,7 +155,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/doc/articles/springmail.html b/doc/articles/springmail.html
index c41707005..0b171f5cf 100644
--- a/doc/articles/springmail.html
+++ b/doc/articles/springmail.html
@@ -299,7 +299,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/doc/articles/springmvcaccessdata.html b/doc/articles/springmvcaccessdata.html
index afb193104..d48f4dddf 100644
--- a/doc/articles/springmvcaccessdata.html
+++ b/doc/articles/springmvcaccessdata.html
@@ -142,7 +142,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/doc/articles/springsecurity.html b/doc/articles/springsecurity.html
index ebd5773c3..05bd175fc 100644
--- a/doc/articles/springsecurity.html
+++ b/doc/articles/springsecurity.html
@@ -174,7 +174,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/doc/articles/standarddialect5minutes.html b/doc/articles/standarddialect5minutes.html
index edbf9ae95..f07dbaa67 100644
--- a/doc/articles/standarddialect5minutes.html
+++ b/doc/articles/standarddialect5minutes.html
@@ -110,7 +110,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/doc/articles/standardurlsyntax.html b/doc/articles/standardurlsyntax.html
index 2c28ab7a8..5ab5898b2 100644
--- a/doc/articles/standardurlsyntax.html
+++ b/doc/articles/standardurlsyntax.html
@@ -99,7 +99,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/doc/articles/thvsjsp.html b/doc/articles/thvsjsp.html
index 507fcc20b..d11d66416 100644
--- a/doc/articles/thvsjsp.html
+++ b/doc/articles/thvsjsp.html
@@ -190,7 +190,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/doc/articles/thymeleaf31whatsnew.html b/doc/articles/thymeleaf31whatsnew.html
index d1c3adddc..e5c334038 100644
--- a/doc/articles/thymeleaf31whatsnew.html
+++ b/doc/articles/thymeleaf31whatsnew.html
@@ -129,7 +129,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/doc/articles/thymeleaf31whatsnew_ja.html b/doc/articles/thymeleaf31whatsnew_ja.html
index 03157a528..99e12fc5c 100644
--- a/doc/articles/thymeleaf31whatsnew_ja.html
+++ b/doc/articles/thymeleaf31whatsnew_ja.html
@@ -129,7 +129,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/doc/articles/thymeleaf3migration.html b/doc/articles/thymeleaf3migration.html
index ce4834cd4..d157e607a 100644
--- a/doc/articles/thymeleaf3migration.html
+++ b/doc/articles/thymeleaf3migration.html
@@ -177,7 +177,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/doc/tutorials/3.0/extendingthymeleaf.md b/doc/tutorials/3.0/extendingthymeleaf.md
index 795b86aa1..7a9d5ce73 100644
--- a/doc/tutorials/3.0/extendingthymeleaf.md
+++ b/doc/tutorials/3.0/extendingthymeleaf.md
@@ -1,6 +1,6 @@
---
title: 'Tutorial: Extending Thymeleaf'
-author: The Thymeleaf Team
+author: Thymeleaf
version: @documentVersion@
thymeleafVersion: @projectVersion@
---
diff --git a/doc/tutorials/3.0/thymeleafspring.md b/doc/tutorials/3.0/thymeleafspring.md
index d2ea6f4b4..f41da8b0e 100644
--- a/doc/tutorials/3.0/thymeleafspring.md
+++ b/doc/tutorials/3.0/thymeleafspring.md
@@ -1,6 +1,6 @@
---
title: 'Tutorial: Thymeleaf + Spring'
-author: The Thymeleaf Team
+author: Thymeleaf
version: @documentVersion@
thymeleafVersion: @projectVersion@
---
diff --git a/doc/tutorials/3.0/usingthymeleaf.md b/doc/tutorials/3.0/usingthymeleaf.md
index c9355e218..e98df5549 100644
--- a/doc/tutorials/3.0/usingthymeleaf.md
+++ b/doc/tutorials/3.0/usingthymeleaf.md
@@ -1,6 +1,6 @@
---
title: 'Tutorial: Using Thymeleaf'
-author: The Thymeleaf Team
+author: Thymeleaf
version: @documentVersion@
thymeleafVersion: @projectVersion@
---
diff --git a/doc/tutorials/3.0/usingthymeleaf_ja.md b/doc/tutorials/3.0/usingthymeleaf_ja.md
index a8971dc4c..8420b6845 100644
--- a/doc/tutorials/3.0/usingthymeleaf_ja.md
+++ b/doc/tutorials/3.0/usingthymeleaf_ja.md
@@ -1,6 +1,6 @@
---
title: 'Tutorial: Using Thymeleaf (ja)'
-author: The Thymeleaf Team
+author: Thymeleaf
version: 20141222 - 22 December 2014
thymeleafVersion: 2.1.4.RELEASE
language: Japanese
diff --git a/documentation.html b/documentation.html
index b7de26748..78d0c1508 100755
--- a/documentation.html
+++ b/documentation.html
@@ -408,7 +408,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/download.html b/download.html
index 7cafafaca..a2bb6b323 100755
--- a/download.html
+++ b/download.html
@@ -232,7 +232,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/ecosystem.html b/ecosystem.html
index 4ca79bad4..563232cc5 100755
--- a/ecosystem.html
+++ b/ecosystem.html
@@ -779,7 +779,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/faq.html b/faq.html
index 4e6f2986f..6436d0bad 100755
--- a/faq.html
+++ b/faq.html
@@ -466,7 +466,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/index.html b/index.html
index 9e29a92bd..1cea36bdd 100755
--- a/index.html
+++ b/index.html
@@ -255,7 +255,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/issuetracking.html b/issuetracking.html
index 798fda416..8b6b6bf3d 100755
--- a/issuetracking.html
+++ b/issuetracking.html
@@ -148,7 +148,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/releasenotes.html b/releasenotes.html
index aaa6c2c22..6a6bd7642 100755
--- a/releasenotes.html
+++ b/releasenotes.html
@@ -296,7 +296,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/team.html b/team.html
index f0c032970..891cb3d0e 100755
--- a/team.html
+++ b/team.html
@@ -351,7 +351,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf
Thymeleaf is
open source software distributed under the
Apache License 2.0
diff --git a/whoisusingthymeleaf.html b/whoisusingthymeleaf.html
index a03a5c3a2..8362c10c9 100755
--- a/whoisusingthymeleaf.html
+++ b/whoisusingthymeleaf.html
@@ -479,7 +479,7 @@
External links
Copyright © The Thymeleaf Team
+ Copyright © Thymeleaf