diff --git a/README.md b/README.md
index dd9437d..f390d61 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ api.stop_rsi()
 Start the CLI for interactive robot control:
 
 ```bash
-python src/RSIPI/cli.py
+python src/RSIPI/rsi_cli.py
 ```
 
 Example CLI commands:
diff --git a/src/RSIPI/krl_parser.py b/src/RSIPI/krl_to_csv_parser.py
similarity index 100%
rename from src/RSIPI/krl_parser.py
rename to src/RSIPI/krl_to_csv_parser.py
diff --git a/src/RSIPI/network_process.py b/src/RSIPI/network_handler.py
similarity index 100%
rename from src/RSIPI/network_process.py
rename to src/RSIPI/network_handler.py
diff --git a/src/RSIPI/rsi_api.py b/src/RSIPI/rsi_api.py
index dd3e559..fa4d8a6 100644
--- a/src/RSIPI/rsi_api.py
+++ b/src/RSIPI/rsi_api.py
@@ -4,9 +4,9 @@ import numpy as np
 import json
 import matplotlib.pyplot as plt
 from .rsi_client import RSIClient
-from .graphing import RSIGraphing
+from .rsi_graphing import RSIGraphing
 from .kuka_visualizer import KukaRSIVisualizer
-from .krl_parser import KRLParser
+from .krl_to_csv_parser import KRLParser
 
 class RSIAPI:
     """RSI API for programmatic control, including alerts, logging, graphing, and data retrieval."""
diff --git a/src/RSIPI/cli.py b/src/RSIPI/rsi_cli.py
similarity index 99%
rename from src/RSIPI/cli.py
rename to src/RSIPI/rsi_cli.py
index 5dbf329..5360d39 100644
--- a/src/RSIPI/cli.py
+++ b/src/RSIPI/rsi_cli.py
@@ -1,6 +1,6 @@
 from .rsi_client import RSIClient
 from .kuka_visualizer import KukaRSIVisualizer
-from .krl_parser import KRLParser
+from .krl_to_csv_parser import KRLParser
 
 class RSICommandLineInterface:
     """Command-Line Interface for controlling RSI Client."""
diff --git a/src/RSIPI/rsi_client.py b/src/RSIPI/rsi_client.py
index b3b6bab..85bd379 100644
--- a/src/RSIPI/rsi_client.py
+++ b/src/RSIPI/rsi_client.py
@@ -2,7 +2,7 @@ import logging
 import multiprocessing
 import time
 from .config_parser import ConfigParser
-from .network_process import NetworkProcess
+from .network_handler import NetworkProcess
 
 class RSIClient:
     """Main RSI API class that integrates network, config handling, and message processing."""
diff --git a/src/RSIPI/graphing.py b/src/RSIPI/rsi_graphing.py
similarity index 100%
rename from src/RSIPI/graphing.py
rename to src/RSIPI/rsi_graphing.py