diff --git a/RomiReference/robot.py b/RomiReference/robot.py
index 0cfc34e6..1b587d3f 100644
--- a/RomiReference/robot.py
+++ b/RomiReference/robot.py
@@ -22,19 +22,22 @@
 # Run the program
 # ---------------
 #
-# To run the program you will need to explicitly use the ws-client option:
+# Use the dedicated ROMI command:
 #
 #    # Windows
-#    py -3 robotpy sim --ws-client
+#    py -3 -m robotpy run-romi
 #
 #    # Linux/macOS
-#    python robotpy sim --ws-client
+#    python -m robotpy run-romi
+#
+# If your ROMI isn't at the default address, use --host/--port:
+#
+#    python -m robotpy run-romi --host 10.0.0.2 --port 3300
 #
 # By default the WPILib simulation GUI will be displayed. To disable the display
-# you can add the --nogui option
+# you can add the --nogui option.
 #
 
-import os
 import typing
 
 import wpilib
@@ -42,10 +45,6 @@
 
 from robotcontainer import RobotContainer
 
-# If your ROMI isn't at the default address, set that here
-os.environ["HALSIMWS_HOST"] = "10.0.0.2"
-os.environ["HALSIMWS_PORT"] = "3300"
-
 
 class MyRobot(commands2.TimedCommandRobot):
     """
diff --git a/XrpReference/robot.py b/XrpReference/robot.py
index b5bcc3dd..e9399f08 100644
--- a/XrpReference/robot.py
+++ b/XrpReference/robot.py
@@ -22,19 +22,22 @@
 # Run the program
 # ---------------
 #
-# To run the program you will need to explicitly use the XRP option:
+# Use the dedicated XRP command:
 #
 #    # Windows
-#    py -3 robotpy sim --xrp
+#    py -3 -m robotpy run-xrp
 #
 #    # Linux/macOS
-#    python robotpy sim --xrp
+#    python -m robotpy run-xrp
+#
+# If your XRP isn't at the default address, use --host/--port:
+#
+#    python -m robotpy run-xrp --host 192.168.42.1 --port 3540
 #
 # By default the WPILib simulation GUI will be displayed. To disable the display
-# you can add the --nogui option
+# you can add the --nogui option.
 #
 
-import os
 import typing
 
 import wpilib
@@ -42,10 +45,6 @@
 
 from robotcontainer import RobotContainer
 
-# If your XRP isn't at the default address, set that here
-os.environ["HALSIMXRP_HOST"] = "192.168.42.1"
-os.environ["HALSIMXRP_PORT"] = "3540"
-
 
 class MyRobot(commands2.TimedCommandRobot):
     """