diff --git a/README.md b/README.md
index 884f1de7..b636c40b 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ In the setup described here it is at the time of writing important that the GitH
    idea ~/git/openrewrite/rewrite-python/rewrite
    ```
 6. Make sure that the Python plugin is installed and also that the interpreter from the created venv is configured and used
-7. Create a new run configuration which runs the Python module `rewrite.remote.server` (typically in debug mode)
+7. Create a new run configuration which runs the Python module `rewrite_remote.server` (typically in debug mode)
 8. Now open `~/git/openrewrite/rewrite-python` in a second IDEA workspace and run the JUnit tests from there
 
 ### Resources
diff --git a/rewrite/.run/rewrite.remote.server.run.xml b/rewrite/.run/rewrite.remote.server.run.xml
index 45910ef8..b9a7cced 100644
--- a/rewrite/.run/rewrite.remote.server.run.xml
+++ b/rewrite/.run/rewrite.remote.server.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="rewrite.remote.server" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
+  <configuration default="false" name="rewrite_remote.server" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
     <module name="rewrite" />
     <option name="ENV_FILES" value="" />
     <option name="INTERPRETER_OPTIONS" value="" />
@@ -14,7 +14,7 @@
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="rewrite.remote.server" />
+    <option name="SCRIPT_NAME" value="rewrite_remote.server" />
     <option name="PARAMETERS" value="54322 1000000" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
diff --git a/rewrite/rewrite/java/remote/extensions.py b/rewrite/rewrite/java/remote/extensions.py
index 6e76a11d..a0d874fe 100644
--- a/rewrite/rewrite/java/remote/extensions.py
+++ b/rewrite/rewrite/java/remote/extensions.py
@@ -3,7 +3,7 @@
 from typing import Type, Callable, TypeVar, Optional
 
 from rewrite.java import *
-from rewrite.remote import SenderContext, ReceiverContext
+from rewrite_remote import SenderContext, ReceiverContext
 
 T = TypeVar('T')
 
diff --git a/rewrite/rewrite/java/remote/receiver.py b/rewrite/rewrite/java/remote/receiver.py
index 78e98883..bd2289ba 100644
--- a/rewrite/rewrite/java/remote/receiver.py
+++ b/rewrite/rewrite/java/remote/receiver.py
@@ -7,7 +7,7 @@
 from rewrite.java.support_types import *
 from rewrite.java.visitor import JavaVisitor
 
-from rewrite.remote import Receiver, ReceiverContext, T, ReceiverFactory
+from rewrite_remote import Receiver, ReceiverContext, T, ReceiverFactory
 from . import extensions
 
 class JavaReceiver(Receiver):
diff --git a/rewrite/rewrite/java/remote/sender.py b/rewrite/rewrite/java/remote/sender.py
index ef072e86..c0613dca 100644
--- a/rewrite/rewrite/java/remote/sender.py
+++ b/rewrite/rewrite/java/remote/sender.py
@@ -4,7 +4,7 @@
 from typing import Optional, TypeVar, cast
 
 from rewrite import Tree, TreeVisitor, Markers, Marker, Cursor
-from rewrite.remote import Sender, SenderContext
+from rewrite_remote import Sender, SenderContext
 from rewrite.java import *
 from rewrite.java.support_types import *
 from . import extensions
diff --git a/rewrite/rewrite/python/remote/extensions.py b/rewrite/rewrite/python/remote/extensions.py
index f2ae3e5d..8e8e6bec 100644
--- a/rewrite/rewrite/python/remote/extensions.py
+++ b/rewrite/rewrite/python/remote/extensions.py
@@ -4,7 +4,7 @@
 
 from rewrite.java import *
 from rewrite.python.tree import PyComment
-from rewrite.remote import SenderContext, ReceiverContext
+from rewrite_remote import SenderContext, ReceiverContext
 
 T = TypeVar('T')
 
diff --git a/rewrite/rewrite/python/remote/receiver.py b/rewrite/rewrite/python/remote/receiver.py
index 7489ee9d..fed8d045 100644
--- a/rewrite/rewrite/python/remote/receiver.py
+++ b/rewrite/rewrite/python/remote/receiver.py
@@ -8,7 +8,7 @@
 from rewrite.python.visitor import PythonVisitor
 from rewrite.java import *
 
-from rewrite.remote import Receiver, ReceiverContext, T, ReceiverFactory
+from rewrite_remote import Receiver, ReceiverContext, T, ReceiverFactory
 from . import extensions
 
 class PythonReceiver(Receiver):
diff --git a/rewrite/rewrite/python/remote/sender.py b/rewrite/rewrite/python/remote/sender.py
index dcc9da11..d286f41f 100644
--- a/rewrite/rewrite/python/remote/sender.py
+++ b/rewrite/rewrite/python/remote/sender.py
@@ -4,7 +4,7 @@
 from typing import Optional, TypeVar, cast
 
 from rewrite import Tree, TreeVisitor, Markers, Marker, Cursor
-from rewrite.remote import Sender, SenderContext
+from rewrite_remote import Sender, SenderContext
 from rewrite.python import *
 from rewrite.java import *
 from rewrite.python.support_types import *
diff --git a/rewrite/rewrite/test.py b/rewrite/rewrite/test.py
index b20d1a04..01208f78 100644
--- a/rewrite/rewrite/test.py
+++ b/rewrite/rewrite/test.py
@@ -89,8 +89,8 @@ def with_parsers(self, parsers: Iterable[ParserBuilder]) -> RecipeSpec:
 
 
 def rewrite_run(*source_specs: Iterable[SourceSpec], spec: RecipeSpec = None):
-    from rewrite.remote import RemotingContext, RemotePrinterFactory
-    from rewrite.remote.server import register_remoting_factories
+    from rewrite_remote import RemotingContext, RemotePrinterFactory
+    from rewrite_remote.server import register_remoting_factories
     remoting_context = RemotingContext()
     register_remoting_factories()
     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
diff --git a/rewrite/tests/manual_parser_test.py b/rewrite/tests/manual_parser_test.py
index c64044bc..61444daa 100644
--- a/rewrite/tests/manual_parser_test.py
+++ b/rewrite/tests/manual_parser_test.py
@@ -8,8 +8,8 @@
 
 path = sys.argv[1] if len(sys.argv) > 1 else '/Users/knut/git/moderneinc/moderne-cli/working-set/face-alignment/examples/detect_landmarks_in_image.py'
 
-from rewrite.remote import RemotingContext, RemotePrinterFactory
-from rewrite.remote.server import register_remoting_factories
+from rewrite_remote import RemotingContext, RemotePrinterFactory
+from rewrite_remote.server import register_remoting_factories
 
 remoting_context = RemotingContext()
 register_remoting_factories()