diff --git a/src/gallia/commands/__init__.py b/src/gallia/commands/__init__.py
index 715c1548b..66d82a24b 100644
--- a/src/gallia/commands/__init__.py
+++ b/src/gallia/commands/__init__.py
@@ -11,15 +11,15 @@
 from gallia.commands.primitive.uds.dtc import DTCPrimitive
 from gallia.commands.primitive.uds.ecu_reset import ECUResetPrimitive
 from gallia.commands.primitive.uds.iocbi import IOCBIPrimitive
+from gallia.commands.primitive.uds.pdu import SendPDUPrimitive
 from gallia.commands.primitive.uds.ping import PingPrimitive
-from gallia.commands.primitive.uds.read_by_identifier import ReadByIdentifierPrimitive
+from gallia.commands.primitive.uds.rdbi import ReadByIdentifierPrimitive
 from gallia.commands.primitive.uds.rmba import RMBAPrimitive
 from gallia.commands.primitive.uds.rtcl import RTCLPrimitive
-from gallia.commands.primitive.uds.send_pdu import SendPDUPrimitive
-from gallia.commands.primitive.uds.test_xcp import SimpleTestXCP
 from gallia.commands.primitive.uds.vin import VINPrimitive
+from gallia.commands.primitive.uds.wdbi import WriteByIdentifierPrimitive
 from gallia.commands.primitive.uds.wmba import WMBAPrimitive
-from gallia.commands.primitive.uds.write_by_identifier import WriteByIdentifierPrimitive
+from gallia.commands.primitive.uds.xcp import SimpleTestXCP
 from gallia.commands.scan.uds.identifiers import ScanIdentifiers
 from gallia.commands.scan.uds.memory import MemoryFunctionsScanner
 from gallia.commands.scan.uds.reset import ResetScanner
diff --git a/src/gallia/commands/primitive/uds/send_pdu.py b/src/gallia/commands/primitive/uds/pdu.py
similarity index 100%
rename from src/gallia/commands/primitive/uds/send_pdu.py
rename to src/gallia/commands/primitive/uds/pdu.py
diff --git a/src/gallia/commands/primitive/uds/read_by_identifier.py b/src/gallia/commands/primitive/uds/rdbi.py
similarity index 98%
rename from src/gallia/commands/primitive/uds/read_by_identifier.py
rename to src/gallia/commands/primitive/uds/rdbi.py
index 229f80687..5981e33e3 100644
--- a/src/gallia/commands/primitive/uds/read_by_identifier.py
+++ b/src/gallia/commands/primitive/uds/rdbi.py
@@ -17,7 +17,7 @@ class ReadByIdentifierPrimitive(UDSScanner):
     """Read data via the ReadDataByIdentifier service"""
 
     GROUP = "primitive"
-    COMMAND = "rdbid"
+    COMMAND = "rdbi"
     SHORT_HELP = "ReadDataByIdentifier"
 
     def configure_parser(self) -> None:
diff --git a/src/gallia/commands/primitive/uds/write_by_identifier.py b/src/gallia/commands/primitive/uds/wdbi.py
similarity index 99%
rename from src/gallia/commands/primitive/uds/write_by_identifier.py
rename to src/gallia/commands/primitive/uds/wdbi.py
index d5c789298..f97364537 100644
--- a/src/gallia/commands/primitive/uds/write_by_identifier.py
+++ b/src/gallia/commands/primitive/uds/wdbi.py
@@ -19,7 +19,7 @@ class WriteByIdentifierPrimitive(UDSScanner):
     """A simple scanner to talk to the write by identifier service"""
 
     GROUP = "primitive"
-    COMMAND = "wdbid"
+    COMMAND = "wdbi"
     SHORT_HELP = "WriteDataByIdentifier"
 
     def configure_parser(self) -> None:
diff --git a/src/gallia/commands/primitive/uds/test_xcp.py b/src/gallia/commands/primitive/uds/xcp.py
similarity index 100%
rename from src/gallia/commands/primitive/uds/test_xcp.py
rename to src/gallia/commands/primitive/uds/xcp.py