diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b83995..cd83e87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,11 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Changed
+
+- Updated recipient element names
+  [PR-38](https://github.com/itk-dev/os2forms_digital_post/pull/38)
+
 ## [1.2.2]
 
 ### Added
diff --git a/src/Plugin/WebformHandler/WebformHandlerSF1601.php b/src/Plugin/WebformHandler/WebformHandlerSF1601.php
index 7688c67..7a8369e 100644
--- a/src/Plugin/WebformHandler/WebformHandlerSF1601.php
+++ b/src/Plugin/WebformHandler/WebformHandlerSF1601.php
@@ -243,6 +243,10 @@ private function getRecipientElements(): array {
 
     $elementTypes = [
       'textfield',
+      'os2forms_nemid_company_cvr',
+      'os2forms_nemid_company_cvr_fetch_data',
+      'os2forms_nemid_cpr',
+      // @todo Remove these when we remove the elements.
       'cpr_element',
       'cpr_value_element',
       'cvr_element',