7 files changed, 8 insertions, 8 deletions
diff --git a/website/resources/.well-known/security.txt b/website/resources/.well-known/security.txt
index 486d8b66..2a36bf3c 100644
--- a/website/resources/.well-known/security.txt
+++ b/website/resources/.well-known/security.txt
@@ -3,6 +3,6 @@ Contact: mailto:info@projectlombok.org
 Preferred-Languages: en
 Canonical: https://projectlombok.org/.well-known/security.txt
 Policy: https://tidelift.com/security
-Policy: https://github.com/rzwitserloot/lombok/blob/master/SECURITY.md
+Policy: https://github.com/projectlombok/lombok/blob/master/SECURITY.md
 
 # If encrypted communication is required, let us know and we'll provide a public GPG key.
 \ No newline at end of file
diff --git a/website/templates/_scaffold.html b/website/templates/_scaffold.html
index 39e03bb2..98eca8af 100644
--- a/website/templates/_scaffold.html
+++ b/website/templates/_scaffold.html
@@ -96,7 +96,7 @@ ga('send', 'pageview');
 							<a class="dropdown-toggle pointer" data-toggle="dropdown">Community<span class="caret"></span></a>
 							<ul class="dropdown-menu" aria-labelledby="themes">
 								<li><a href="https://groups.google.com/group/project-lombok">Discuss / Help</a></li>
-								<li><a href="https://github.com/rzwitserloot/lombok/issues">Issues</a></li>
+								<li><a href="https://github.com/projectlombok/lombok/issues">Issues</a></li>
 								<li><a href="/contributing/index">Documentation for contributors</a></li>
 								<li><a href="/contact">Contact the team behind Project Lombok</a></li>
 							</ul>
diff --git a/website/templates/contact.html b/website/templates/contact.html
index 584c41bf..41912015 100644
--- a/website/templates/contact.html
+++ b/website/templates/contact.html
@@ -8,7 +8,7 @@
 				</p><p>
 					To contact us, <ul>
 						<li>There's a <a href="https://groups.google.com/group/project-lombok">forum</a>; we read and respond here.</li>
-						<li>If you have a feature request or bug report, please file it on our <a href="https://github.com/rzwitserloot/lombok/issues">github bug tracker</a>.</li>
+						<li>If you have a feature request or bug report, please file it on our <a href="https://github.com/projectlombok/lombok/issues">github bug tracker</a>.</li>
 						<li>If you have a security vulnerability to report, please contact us via our <a href="/security">security vulnerability disclosure</a> page.</li>
 						<li>We love giving presentations, about lombok, or even just general java things. <a href="mailto:info@projectlombok.org">Send us a mail</a> if you want to invite us to do a talk.</li>
 					</ul>
diff --git a/website/templates/contributing/contributing.html b/website/templates/contributing/contributing.html
index 8da9b827..54d3ac4f 100644
--- a/website/templates/contributing/contributing.html
+++ b/website/templates/contributing/contributing.html
@@ -10,7 +10,7 @@
 		<div class="row text-center">
 			<@main.h1 title="How to work on Project Lombok yourself" />
 		</div><div class="row">
-			Project Lombok is being developed via the <a href="https://github.com/rzwitserloot/lombok">lombok git repository on github</a>.
+			Project Lombok is being developed via the <a href="https://github.com/projectlombok/lombok">lombok git repository on github</a>.
 		</div><div class="row">
 			<p>
 				If you want to start development on lombok, clone the repository and run <code>ant eclipse</code> or <code>ant intellij</code>, then open the working directory as a project in eclipse / intellij. Because the main contributors of lombok all use eclipse, that'll probably work a little more smoothly.
diff --git a/website/templates/contributing/index.html b/website/templates/contributing/index.html
index c6c85483..f0e3ef9a 100644
--- a/website/templates/contributing/index.html
+++ b/website/templates/contributing/index.html
@@ -14,7 +14,7 @@
 			</@main.feature>
 		</div>
 		<div class="row">
-			More documentation can be found on the <a href="https://github.com/rzwitserloot/lombok/wiki">project lombok github wiki</a>.
+			More documentation can be found on the <a href="https://github.com/projectlombok/lombok/wiki">project lombok github wiki</a>.
 		</div>
 	</div>
 </@main.scaffold>
diff --git a/website/templates/disable-checked-exceptions.html b/website/templates/disable-checked-exceptions.html
index 4a758b11..46e05325 100644
--- a/website/templates/disable-checked-exceptions.html
+++ b/website/templates/disable-checked-exceptions.html
@@ -21,7 +21,7 @@
 			</p><p>
 				Ready to try it out? download it here: <a href="/downloads/disableCheckedExceptions-alpha.jar">disableCheckedExceptions-alpha.jar</a>
 			</p><p>
-				Want to know how its done? Grab the lombok repository <a href="https://github.com/rzwitserloot/lombok/tree/disableCheckedExceptions">here on github</a>, and look in the <code>experimental</code> directory.
+				Want to know how its done? Grab the lombok repository <a href="https://github.com/projectlombok/lombok/tree/disableCheckedExceptions">here on github</a>, and look in the <code>experimental</code> directory.
 			</p>
 		</div>
 	</div>
diff --git a/website/templates/features/experimental/Accessors.html b/website/templates/features/experimental/Accessors.html
index 54d507f8..564ab66d 100644
--- a/website/templates/features/experimental/Accessors.html
+++ b/website/templates/features/experimental/Accessors.html
@@ -17,8 +17,8 @@
 		</ul>
 		Current status: <em>neutral</em> - Some changes are expected. These changes are intended to be backwards compatible, but should start in an experimental feature:
 		<ul>
-			<li>Open feature request: naming behaviour for properties that start with a lowercase letter followed by an uppercase letter. Half of specs, tools and lombok users prefer that a field named <code>uLimit</code> into <code>getULimit</code> (including lombok) and the other half turn prefer <code>getuLimit</code>. <code>@Accessors</code> may be involved in any update that addresses this <a href="https://github.com/rzwitserloot/lombok/issues/2693">request</a>.</li>
-			<li>Open feature request: More control over naming accessors; for example to address creatively named boolean properties: Turn <code>boolean wasRunning</code> into <code>boolean wasRunning()</code> instead of <code>boolean isWasRunning()</code>, as well as more expansive prefix support. <code>@Accessors</code> will be involved if this feature <a href="https://github.com/rzwitserloot/lombok/issues/2464">request</a> is addressed.</li>
+			<li>Open feature request: naming behaviour for properties that start with a lowercase letter followed by an uppercase letter. Half of specs, tools and lombok users prefer that a field named <code>uLimit</code> into <code>getULimit</code> (including lombok) and the other half turn prefer <code>getuLimit</code>. <code>@Accessors</code> may be involved in any update that addresses this <a href="https://github.com/projectlombok/lombok/issues/2693">request</a>.</li>
+			<li>Open feature request: More control over naming accessors; for example to address creatively named boolean properties: Turn <code>boolean wasRunning</code> into <code>boolean wasRunning()</code> instead of <code>boolean isWasRunning()</code>, as well as more expansive prefix support. <code>@Accessors</code> will be involved if this feature <a href="https://github.com/projectlombok/lombok/issues/2464">request</a> is addressed.</li>
 			<li><code>@Accessors</code> currently does not 'cascade' from field <code>@Accessors</code> annotation to the class-level <code>@Accessors</code> annotation, but it does 'cascade' to <code>lombok.config</code>. Changing this is not difficult but backwards incompatible. It's not likely to break much existing code, but this needs to be decided on before the feature can move out of <em>experimental</em> status.</li>
 		</ul>
 	</@f.experimental>