diff --git a/CHANGELOG.md b/CHANGELOG.md
index 671bcbc..69c3b32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Changed
 
+- Reordered argument order for `FinishedParams` to be in line with the CFDP standard. This might
+  break code not using keyword arguments.
 - Renamed `FileDeliveryStatus` to `FileStatus` to be closer to the CFDP name.
 - Moved `spacepackets.cfdp.pdu.finished.FileDeliveryStatus` to `spacepackets.cfdp.defs.FileStatus`.
   The new enumeration is also re-exported in `spacepackets.cfdp`.
diff --git a/spacepackets/cfdp/pdu/__init__.py b/spacepackets/cfdp/pdu/__init__.py
index 2ac3fbd..f828ed9 100644
--- a/spacepackets/cfdp/pdu/__init__.py
+++ b/spacepackets/cfdp/pdu/__init__.py
@@ -7,7 +7,7 @@
 
 from .ack import AckPdu, TransactionStatus
 from .eof import EofPdu
-from .file_data import FileDataPdu
+from .file_data import FileDataPdu, FileDataParams
 from .file_directive import (
     AbstractFileDirectiveBase,
     DirectiveType,
diff --git a/spacepackets/cfdp/pdu/finished.py b/spacepackets/cfdp/pdu/finished.py
index 404dadf..4e8545a 100644
--- a/spacepackets/cfdp/pdu/finished.py
+++ b/spacepackets/cfdp/pdu/finished.py
@@ -27,9 +27,9 @@
 
 @dataclass
 class FinishedParams:
+    condition_code: ConditionCode
     delivery_code: DeliveryCode
     file_status: FileStatus
-    condition_code: ConditionCode
     file_store_responses: List[FileStoreResponseTlv] = field(default_factory=lambda: [])
     fault_location: Optional[EntityIdTlv] = None