diff --git a/Cargo.lock b/Cargo.lock
index e8072ea218d..c6235d0fd80 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5238,39 +5238,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "servo"
-version = "0.0.1"
-dependencies = [
- "backtrace",
- "cc",
- "clipboard",
- "egui",
- "egui-winit",
- "egui_glow",
- "euclid",
- "getopts",
- "gleam",
- "glow",
- "image",
- "keyboard-types",
- "lazy_static",
- "libc",
- "libservo",
- "log",
- "raw-window-handle",
- "servo-media",
- "shellwords",
- "sig",
- "surfman",
- "tinyfiledialogs",
- "vergen",
- "webxr",
- "winapi",
- "winit",
- "winres",
-]
-
 [[package]]
 name = "servo-display-link"
 version = "0.2.0"
@@ -5575,6 +5542,39 @@ dependencies = [
  "uuid 1.4.1",
 ]
 
+[[package]]
+name = "servoshell"
+version = "0.0.1"
+dependencies = [
+ "backtrace",
+ "cc",
+ "clipboard",
+ "egui",
+ "egui-winit",
+ "egui_glow",
+ "euclid",
+ "getopts",
+ "gleam",
+ "glow",
+ "image",
+ "keyboard-types",
+ "lazy_static",
+ "libc",
+ "libservo",
+ "log",
+ "raw-window-handle",
+ "servo-media",
+ "shellwords",
+ "sig",
+ "surfman",
+ "tinyfiledialogs",
+ "vergen",
+ "webxr",
+ "winapi",
+ "winit",
+ "winres",
+]
+
 [[package]]
 name = "sha1"
 version = "0.10.5"
diff --git a/Cargo.toml b/Cargo.toml
index 31cf7f46a30..8d33084a473 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
-    "ports/winit",
+    "ports/servoshell",
     "ports/gstplugin",
     "ports/libsimpleservo/capi/",
     "ports/libsimpleservo/jniapi/",
diff --git a/ports/winit/Cargo.toml b/ports/servoshell/Cargo.toml
similarity index 99%
rename from ports/winit/Cargo.toml
rename to ports/servoshell/Cargo.toml
index d2661e47be3..cddfb062003 100644
--- a/ports/winit/Cargo.toml
+++ b/ports/servoshell/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 
-name = "servo"
+name = "servoshell"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
 license = "MPL-2.0"
diff --git a/ports/winit/app.rs b/ports/servoshell/app.rs
similarity index 100%
rename from ports/winit/app.rs
rename to ports/servoshell/app.rs
diff --git a/ports/winit/backtrace.rs b/ports/servoshell/backtrace.rs
similarity index 100%
rename from ports/winit/backtrace.rs
rename to ports/servoshell/backtrace.rs
diff --git a/ports/winit/browser.rs b/ports/servoshell/browser.rs
similarity index 100%
rename from ports/winit/browser.rs
rename to ports/servoshell/browser.rs
diff --git a/ports/winit/build.rs b/ports/servoshell/build.rs
similarity index 100%
rename from ports/winit/build.rs
rename to ports/servoshell/build.rs
diff --git a/ports/winit/crash_handler.rs b/ports/servoshell/crash_handler.rs
similarity index 100%
rename from ports/winit/crash_handler.rs
rename to ports/servoshell/crash_handler.rs
diff --git a/ports/winit/egui_glue.rs b/ports/servoshell/egui_glue.rs
similarity index 100%
rename from ports/winit/egui_glue.rs
rename to ports/servoshell/egui_glue.rs
diff --git a/ports/winit/embedder.rs b/ports/servoshell/embedder.rs
similarity index 100%
rename from ports/winit/embedder.rs
rename to ports/servoshell/embedder.rs
diff --git a/ports/winit/events_loop.rs b/ports/servoshell/events_loop.rs
similarity index 100%
rename from ports/winit/events_loop.rs
rename to ports/servoshell/events_loop.rs
diff --git a/ports/winit/headed_window.rs b/ports/servoshell/headed_window.rs
similarity index 100%
rename from ports/winit/headed_window.rs
rename to ports/servoshell/headed_window.rs
diff --git a/ports/winit/headless_window.rs b/ports/servoshell/headless_window.rs
similarity index 100%
rename from ports/winit/headless_window.rs
rename to ports/servoshell/headless_window.rs
diff --git a/ports/winit/keyutils.rs b/ports/servoshell/keyutils.rs
similarity index 100%
rename from ports/winit/keyutils.rs
rename to ports/servoshell/keyutils.rs
diff --git a/ports/winit/main.rs b/ports/servoshell/main.rs
similarity index 100%
rename from ports/winit/main.rs
rename to ports/servoshell/main.rs
diff --git a/ports/winit/main2.rs b/ports/servoshell/main2.rs
similarity index 100%
rename from ports/winit/main2.rs
rename to ports/servoshell/main2.rs
diff --git a/ports/winit/minibrowser.rs b/ports/servoshell/minibrowser.rs
similarity index 100%
rename from ports/winit/minibrowser.rs
rename to ports/servoshell/minibrowser.rs
diff --git a/ports/winit/platform/macos/Info.plist b/ports/servoshell/platform/macos/Info.plist
similarity index 100%
rename from ports/winit/platform/macos/Info.plist
rename to ports/servoshell/platform/macos/Info.plist
diff --git a/ports/winit/platform/macos/count_threads.c b/ports/servoshell/platform/macos/count_threads.c
similarity index 100%
rename from ports/winit/platform/macos/count_threads.c
rename to ports/servoshell/platform/macos/count_threads.c
diff --git a/ports/winit/platform/macos/mod.rs b/ports/servoshell/platform/macos/mod.rs
similarity index 100%
rename from ports/winit/platform/macos/mod.rs
rename to ports/servoshell/platform/macos/mod.rs
diff --git a/ports/winit/platform/windows/servo.exe.manifest b/ports/servoshell/platform/windows/servo.exe.manifest
similarity index 100%
rename from ports/winit/platform/windows/servo.exe.manifest
rename to ports/servoshell/platform/windows/servo.exe.manifest
diff --git a/ports/winit/prefs.rs b/ports/servoshell/prefs.rs
similarity index 100%
rename from ports/winit/prefs.rs
rename to ports/servoshell/prefs.rs
diff --git a/ports/winit/resources.rs b/ports/servoshell/resources.rs
similarity index 100%
rename from ports/winit/resources.rs
rename to ports/servoshell/resources.rs
diff --git a/ports/winit/window_trait.rs b/ports/servoshell/window_trait.rs
similarity index 100%
rename from ports/winit/window_trait.rs
rename to ports/servoshell/window_trait.rs
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 0a632fc0ede..09da1491a8f 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -871,7 +871,7 @@ class CommandBase(object):
                     api = "capi"
                 port = path.join("libsimpleservo", api)
             else:
-                port = "winit"
+                port = "servoshell"
             args += [
                 "--manifest-path",
                 path.join(self.context.topdir, "ports", port, "Cargo.toml"),
diff --git a/python/tidy/tidy.py b/python/tidy/tidy.py
index c9ecf449c85..c79f086d747 100644
--- a/python/tidy/tidy.py
+++ b/python/tidy/tidy.py
@@ -528,9 +528,9 @@ def check_rust(file_name, lines):
     PANIC_NOT_ALLOWED_PATHS = [
         os.path.join("*", "components", "compositing", "compositor.rs"),
         os.path.join("*", "components", "constellation", "*"),
-        os.path.join("*", "ports", "winit", "headed_window.rs"),
-        os.path.join("*", "ports", "winit", "headless_window.rs"),
-        os.path.join("*", "ports", "winit", "embedder.rs"),
+        os.path.join("*", "ports", "servoshell", "headed_window.rs"),
+        os.path.join("*", "ports", "servoshell", "headless_window.rs"),
+        os.path.join("*", "ports", "servoshell", "embedder.rs"),
         os.path.join("*", "rust_tidy.rs"),  # This is for the tests.
     ]
     is_panic_not_allowed_rs_file = any([