diff --git a/README.md b/README.md
index d50d1de11..a58b0281a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-![FluentNHibernate logo](https://raw.githubusercontent.com/jagregory/fluent-nhibernate/master/docs/logo.png)
+![FluentNHibernate logo](https://raw.githubusercontent.com/nhibernate/fluent-nhibernate/main/docs/logo.png)
 
-[![Build status](https://ci.appveyor.com/api/projects/status/684r2ot07i2lrcij/branch/master?svg=true)](https://ci.appveyor.com/project/nhibernate/fluent-nhibernate/branch/master)
+[![Build status](https://ci.appveyor.com/api/projects/status/684r2ot07i2lrcij/branch/main?svg=true)](https://ci.appveyor.com/project/nhibernate/fluent-nhibernate/branch/main)
 [![NuGet](https://img.shields.io/nuget/v/FluentNHibernate.svg)](https://www.nuget.org/packages/FluentNHibernate)
 
 ## What is FluentNHibernate?
@@ -37,5 +37,5 @@ Fluent NHibernate wouldn't be possible without the time and effort of its contri
 
 Thanks goes to [Jeremy Miller](http://codebetter.com/blogs/jeremy.miller) for the original idea and implementation.
     
-Fluent NHibernate is © 2008-2018 [James Gregory](http://jagregory.com) and contributors under the [BSD license](https://github.com/FluentNHibernate/fluent-nhibernate/blob/master/LICENSE)
+Fluent NHibernate is © 2008-2018 [James Gregory](http://jagregory.com) and contributors under the [BSD license](https://github.com/nhibernate/fluent-nhibernate/blob/main/LICENSE)
 
diff --git a/build.cake b/build.cake
index f8541ed7e..be72e899b 100644
--- a/build.cake
+++ b/build.cake
@@ -199,7 +199,7 @@ Task("Create-Release-Notes")
                 Milestone         = parameters.Version.Milestone,
                 Name              = parameters.Version.Milestone,
                 Prerelease        = true,
-                TargetCommitish   = "master"
+                TargetCommitish   = "main"
             }
         );
     });
diff --git a/build/parameters.cake b/build/parameters.cake
index 69e8dad3c..0dd747193 100644
--- a/build/parameters.cake
+++ b/build/parameters.cake
@@ -53,7 +53,7 @@ public class BuildParameters
             IsRunningOnAppVeyor = buildSystem.AppVeyor.IsRunningOnAppVeyor,
             IsPullRequest = buildSystem.AppVeyor.Environment.PullRequest.IsPullRequest,
             IsMainRepo = StringComparer.OrdinalIgnoreCase.Equals("nhibernate/fluent-nhibernate", buildSystem.AppVeyor.Environment.Repository.Name),
-            IsMainBranch = StringComparer.OrdinalIgnoreCase.Equals("master", buildSystem.AppVeyor.Environment.Repository.Branch),            
+            IsMainBranch = StringComparer.OrdinalIgnoreCase.Equals("main", buildSystem.AppVeyor.Environment.Repository.Branch),            
             IsTagged = IsBuildTagged(buildSystem),            
             GitHub = BuildGitHub.GetWithCredentials(context, "nhibernate", "fluent-nhibernate"),
             NuGet = BuildNuGet.GetWithCredentials(context),
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 95b6f6e4b..68f9f4373 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -6,7 +6,7 @@
     <Company>NHibernate.info</Company>
     <PackageDescription>Fluent, XML-less, compile safe, automated, convention-based mappings for NHibernate.</PackageDescription>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <PackageIconUrl>https://raw.githubusercontent.com/nhibernate/fluent-nhibernate/master/docs/logo-nuget.png</PackageIconUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/nhibernate/fluent-nhibernate/main/docs/logo-nuget.png</PackageIconUrl>
     <PackageIcon>logo-nuget.png</PackageIcon>
     <PackageProjectUrl>https://github.com/nhibernate/fluent-nhibernate</PackageProjectUrl>
     <PackageTags>ORM;DAL;NHibernate;Fluent;Conventions;DataBase;ADO.Net;Mappings</PackageTags>