diff --git a/litex/soc/tools/flterm.py b/litex/soc/tools/litex_term.py
similarity index 100%
rename from litex/soc/tools/flterm.py
rename to litex/soc/tools/litex_term.py
diff --git a/litex/soc/tools/remote/client.py b/litex/soc/tools/remote/litex_client.py
similarity index 100%
rename from litex/soc/tools/remote/client.py
rename to litex/soc/tools/remote/litex_client.py
diff --git a/litex/soc/tools/remote/server.py b/litex/soc/tools/remote/litex_server.py
similarity index 100%
rename from litex/soc/tools/remote/server.py
rename to litex/soc/tools/remote/litex_server.py
diff --git a/setup.py b/setup.py
index e10cf41ec..3b98b6d45 100755
--- a/setup.py
+++ b/setup.py
@@ -34,10 +34,10 @@ setup(
     include_package_data=True,
     entry_points={
         "console_scripts": [
-            "flterm=litex.soc.tools.flterm:main",
+            "litex_term=litex.soc.tools.litex_term:main",
             "mkmscimg=litex.soc.tools.mkmscimg:main",
-            "remote_server=litex.soc.tools.remote.server:main",
-            "remote_client=litex.soc.tools.remote.client:main"
+            "litex_server=litex.soc.tools.remote.litex_server:main",
+            "litex_client=litex.soc.tools.remote.litex_client:main"
         ],
     },
 )