diff --git a/setup/Tycho.setup b/setup/Tycho.setup
index de31143489..bdec090ade 100644
--- a/setup/Tycho.setup
+++ b/setup/Tycho.setup
@@ -108,7 +108,7 @@
   <setupTask
       xsi:type="setup:EclipseIniTask"
       option="-Doomph.redirection.tycho="
-      value="https://raw.githubusercontent.com/eclipse-tycho/tycho/master/setup/Tycho.setup->${git.cloneTycho.location|uri}/setup/Tycho.setup"
+      value="https://raw.githubusercontent.com/eclipse-tycho/tycho/main/setup/Tycho.setup->${git.cloneTycho.location|uri}/setup/Tycho.setup"
       vm="true"/>
   <setupTask
       xsi:type="setup.p2:P2Task"
@@ -191,9 +191,9 @@
       xsi:type="projects:ProjectsBuildTask"
       refresh="true"
       clean="true"/>
-  <stream name="master"
-      label="master">
-    <description>Tycho Master</description>
+  <stream name="main"
+      label="main">
+    <description>Tycho Main</description>
   </stream>
   <logicalProjectContainer
       xsi:type="setup:ProjectCatalog"
diff --git a/setup/TychoDevelopmentConfiguration.setup b/setup/TychoDevelopmentConfiguration.setup
index fe7d3c5ee3..74786da1bf 100644
--- a/setup/TychoDevelopmentConfiguration.setup
+++ b/setup/TychoDevelopmentConfiguration.setup
@@ -26,7 +26,7 @@
       name="tycho.dev.workspace"
       label="Tycho Development Workspace">
     <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='tycho']/@streams[name='master']"/>
+        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='tycho']/@streams[name='main']"/>
     <description>The Tycho development environment workspace includes all modules and tests of Eclipse Tycho.</description>
   </workspace>
   <description>