diff --git a/config/install/field.field.profile.contact.field_address.yml b/config/install/field.field.profile.contact.address.yml
similarity index 87%
rename from config/install/field.field.profile.contact.field_address.yml
rename to config/install/field.field.profile.contact.address.yml
index e399f7df8d55598e3f26bda03fc286315fae0892..ba72f83cb3eed3ea102ca3b493932f2903963883 100644
--- a/config/install/field.field.profile.contact.field_address.yml
+++ b/config/install/field.field.profile.contact.address.yml
@@ -2,12 +2,12 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.profile.field_address
+    - field.storage.profile.address
     - profile.type.contact
   module:
     - address
-id: profile.contact.field_address
-field_name: field_address
+id: profile.contact.address
+field_name: address
 entity_type: profile
 bundle: contact
 label: address
diff --git a/config/install/field.field.profile.customer.address.yml b/config/install/field.field.profile.customer.address.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9e94bdbbce1c1866660128298cdb8f20e5767f8f
--- /dev/null
+++ b/config/install/field.field.profile.customer.address.yml
@@ -0,0 +1,37 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.profile.address
+    - profile.type.customer
+  module:
+    - address
+id: profile.customer.address
+field_name: address
+entity_type: profile
+bundle: customer
+label: Address
+description: ''
+required: true
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  available_countries: {  }
+  langcode_override: ''
+  field_overrides:
+    addressLine3:
+      override: hidden
+  fields:
+    administrativeArea: administrativeArea
+    locality: locality
+    dependentLocality: dependentLocality
+    postalCode: postalCode
+    sortingCode: sortingCode
+    addressLine1: addressLine1
+    addressLine2: addressLine2
+    organization: organization
+    givenName: givenName
+    additionalName: additionalName
+    familyName: familyName
+field_type: address
diff --git a/config/install/field.field.profile.organisation.field_contact_profiles.yml b/config/install/field.field.profile.customer.field_contact_profiles.yml
similarity index 84%
rename from config/install/field.field.profile.organisation.field_contact_profiles.yml
rename to config/install/field.field.profile.customer.field_contact_profiles.yml
index 2c60f3d372535f21d7dc0a705a9cbae845bfd41a..979af16407814f00e0c83ea86348cd9764c2a352 100644
--- a/config/install/field.field.profile.organisation.field_contact_profiles.yml
+++ b/config/install/field.field.profile.customer.field_contact_profiles.yml
@@ -4,11 +4,11 @@ dependencies:
   config:
     - field.storage.profile.field_contact_profiles
     - profile.type.contact
-    - profile.type.organisation
-id: profile.organisation.field_contact_profiles
+    - profile.type.customer
+id: profile.customer.field_contact_profiles
 field_name: field_contact_profiles
 entity_type: profile
-bundle: organisation
+bundle: customer
 label: 'Contact profiles'
 description: ''
 required: false
diff --git a/config/install/field.field.profile.organisation.field_e_mail.yml b/config/install/field.field.profile.customer.field_e_mail.yml
similarity index 75%
rename from config/install/field.field.profile.organisation.field_e_mail.yml
rename to config/install/field.field.profile.customer.field_e_mail.yml
index c42ad340b530132e46fd4ab9005847a0caac8f26..add3c34ff8e8fa77ca9898364bd7b8bdfa389b2e 100644
--- a/config/install/field.field.profile.organisation.field_e_mail.yml
+++ b/config/install/field.field.profile.customer.field_e_mail.yml
@@ -3,11 +3,11 @@ status: true
 dependencies:
   config:
     - field.storage.profile.field_e_mail
-    - profile.type.organisation
-id: profile.organisation.field_e_mail
+    - profile.type.customer
+id: profile.customer.field_e_mail
 field_name: field_e_mail
 entity_type: profile
-bundle: organisation
+bundle: customer
 label: E-mail
 description: ''
 required: false
diff --git a/config/install/field.field.profile.organisation.field_info.yml b/config/install/field.field.profile.customer.field_info.yml
similarity index 77%
rename from config/install/field.field.profile.organisation.field_info.yml
rename to config/install/field.field.profile.customer.field_info.yml
index 89ba6e78c9e8ded867b5baf0a5d8ff8075ea66c3..3b5a076ef8733df6698dca85eafaa1c5885f66d1 100644
--- a/config/install/field.field.profile.organisation.field_info.yml
+++ b/config/install/field.field.profile.customer.field_info.yml
@@ -3,13 +3,13 @@ status: true
 dependencies:
   config:
     - field.storage.profile.field_info
-    - profile.type.organisation
+    - profile.type.customer
   module:
     - text
-id: profile.organisation.field_info
+id: profile.customer.field_info
 field_name: field_info
 entity_type: profile
-bundle: organisation
+bundle: customer
 label: Info
 description: ''
 required: false
diff --git a/config/install/field.field.profile.organisation.field_locations.yml b/config/install/field.field.profile.customer.field_locations.yml
similarity index 84%
rename from config/install/field.field.profile.organisation.field_locations.yml
rename to config/install/field.field.profile.customer.field_locations.yml
index 42aa058506f81683256705d3f78fd04749abee19..d8b32e1112bbdc154430a94fa6254561755bf366 100644
--- a/config/install/field.field.profile.organisation.field_locations.yml
+++ b/config/install/field.field.profile.customer.field_locations.yml
@@ -4,11 +4,11 @@ dependencies:
   config:
     - field.storage.profile.field_locations
     - profile.type.location
-    - profile.type.organisation
-id: profile.organisation.field_locations
+    - profile.type.customer
+id: profile.customer.field_locations
 field_name: field_locations
 entity_type: profile
-bundle: organisation
+bundle: customer
 label: Locations
 description: ''
 required: false
diff --git a/config/install/field.field.profile.organisation.field_organisation_type.yml b/config/install/field.field.profile.customer.field_organisation_type.yml
similarity index 85%
rename from config/install/field.field.profile.organisation.field_organisation_type.yml
rename to config/install/field.field.profile.customer.field_organisation_type.yml
index a02d9c2d1c9e6a52efe425d753baf01fbb832880..08c1719b4bb63f79c1838f0b2db0924eb0de4266 100644
--- a/config/install/field.field.profile.organisation.field_organisation_type.yml
+++ b/config/install/field.field.profile.customer.field_organisation_type.yml
@@ -3,12 +3,12 @@ status: true
 dependencies:
   config:
     - field.storage.profile.field_organisation_type
-    - profile.type.organisation
+    - profile.type.customer
     - taxonomy.vocabulary.organisation_type
-id: profile.organisation.field_organisation_type
+id: profile.customer.field_organisation_type
 field_name: field_organisation_type
 entity_type: profile
-bundle: organisation
+bundle: customer
 label: 'Organisation type'
 description: ''
 required: false
diff --git a/config/install/field.field.profile.organisation.field_phone.yml b/config/install/field.field.profile.customer.field_phone.yml
similarity index 75%
rename from config/install/field.field.profile.organisation.field_phone.yml
rename to config/install/field.field.profile.customer.field_phone.yml
index 10c783148b3a0bdf9d10961e5441160bff58d74b..54fd4c78f6ec6ed91ce14533c3d49784f640cf88 100644
--- a/config/install/field.field.profile.organisation.field_phone.yml
+++ b/config/install/field.field.profile.customer.field_phone.yml
@@ -3,11 +3,11 @@ status: true
 dependencies:
   config:
     - field.storage.profile.field_phone
-    - profile.type.organisation
-id: profile.organisation.field_phone
+    - profile.type.customer
+id: profile.customer.field_phone
 field_name: field_phone
 entity_type: profile
-bundle: organisation
+bundle: customer
 label: Phone
 description: ''
 required: false
diff --git a/config/install/field.field.profile.organisation.field_website.yml b/config/install/field.field.profile.customer.field_website.yml
similarity index 78%
rename from config/install/field.field.profile.organisation.field_website.yml
rename to config/install/field.field.profile.customer.field_website.yml
index 1f997609f88cfa7bcedbd1a84ca393a0031608ee..7483c647051e90aed0ccd2a8484ac282ec609ad2 100644
--- a/config/install/field.field.profile.organisation.field_website.yml
+++ b/config/install/field.field.profile.customer.field_website.yml
@@ -3,13 +3,13 @@ status: true
 dependencies:
   config:
     - field.storage.profile.field_website
-    - profile.type.organisation
+    - profile.type.customer
   module:
     - link
-id: profile.organisation.field_website
+id: profile.customer.field_website
 field_name: field_website
 entity_type: profile
-bundle: organisation
+bundle: customer
 label: Website
 description: ''
 required: false
diff --git a/config/install/field.field.profile.location.field_address.yml b/config/install/field.field.profile.location.address.yml
similarity index 89%
rename from config/install/field.field.profile.location.field_address.yml
rename to config/install/field.field.profile.location.address.yml
index 3c7eba66e89c64f7af6a8ee73194d262e02e1597..d844320c418454198c90467e30557aca630b06a6 100644
--- a/config/install/field.field.profile.location.field_address.yml
+++ b/config/install/field.field.profile.location.address.yml
@@ -2,12 +2,12 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.profile.field_address
+    - field.storage.profile.address
     - profile.type.location
   module:
     - address
-id: profile.location.field_address
-field_name: field_address
+id: profile.location.address
+field_name: address
 entity_type: profile
 bundle: location
 label: address
diff --git a/config/install/field.field.profile.organisation.field_address.yml b/config/install/field.field.profile.organisation.field_address.yml
deleted file mode 100644
index b45ac48c21ce37341001d2a4bf1c7d5c379c0dd1..0000000000000000000000000000000000000000
--- a/config/install/field.field.profile.organisation.field_address.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.profile.field_address
-    - profile.type.organisation
-  module:
-    - address
-id: profile.organisation.field_address
-field_name: field_address
-entity_type: profile
-bundle: organisation
-label: address
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    langcode: en
-    country_code: BE
-    administrative_area: null
-    locality: ''
-    dependent_locality: null
-    postal_code: ''
-    sorting_code: null
-    address_line1: ''
-    address_line2: ''
-    address_line3: ''
-    organization: ''
-    given_name: null
-    additional_name: null
-    family_name: null
-default_value_callback: ''
-settings:
-  available_countries: {  }
-  langcode_override: ''
-  field_overrides:
-    givenName:
-      override: hidden
-    additionalName:
-      override: hidden
-    familyName:
-      override: hidden
-    addressLine2:
-      override: hidden
-    addressLine3:
-      override: hidden
-    sortingCode:
-      override: hidden
-    dependentLocality:
-      override: hidden
-  fields: {  }
-field_type: address
diff --git a/config/install/field.storage.profile.field_address.yml b/config/install/field.storage.profile.address.yml
similarity index 63%
rename from config/install/field.storage.profile.field_address.yml
rename to config/install/field.storage.profile.address.yml
index c691201485dc98d4fa4522a475d726c129e147cf..0ea3798221b704b3f8ae9246e14caef7fd3f7abb 100644
--- a/config/install/field.storage.profile.field_address.yml
+++ b/config/install/field.storage.profile.address.yml
@@ -3,13 +3,9 @@ status: true
 dependencies:
   module:
     - address
-    - field_permissions
     - profile
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: profile.field_address
-field_name: field_address
+id: profile.address
+field_name: address
 entity_type: profile
 type: address
 settings: {  }
diff --git a/config/install/profile.type.organisation.yml b/config/install/profile.type.customer.yml
similarity index 57%
rename from config/install/profile.type.organisation.yml
rename to config/install/profile.type.customer.yml
index dccb0f2ac98feb32e1e1feef7259d59571297095..ef1d515cd202e265c5587673f88bdcd5ab568d2f 100644
--- a/config/install/profile.type.organisation.yml
+++ b/config/install/profile.type.customer.yml
@@ -1,11 +1,11 @@
 langcode: en
 status: true
 dependencies: {  }
-id: organisation
-label: Organisation
-display_label: ''
+id: customer
+label: Customer
+display_label: 'Customer information'
 multiple: false
-registration: false
+registration: true
 roles: {  }
 allow_revisions: false
 new_revision: false
diff --git a/config/install/views.view.druplan_addressbook.yml b/config/install/views.view.druplan_addressbook.yml
index 3444200c50e94ceba9e2568237385d17f1c0e3b7..4c0eb2ebb82bf3fa4d9747c789974f01687f1555 100644
--- a/config/install/views.view.druplan_addressbook.yml
+++ b/config/install/views.view.druplan_addressbook.yml
@@ -99,22 +99,22 @@ display:
                   type:
                     active: false
                     label: ''
-                  field_address_family_name:
+                  address_family_name:
                     active: false
                     label: ''
-                  field_address_given_name:
+                  address_given_name:
                     active: false
                     label: ''
-                  field_address_organization:
+                  address_organization:
                     active: false
                     label: ''
-                  field_address_address_line1:
+                  address_address_line1:
                     active: false
                     label: ''
-                  field_address_postal_code:
+                  address_postal_code:
                     active: false
                     label: ''
-                  field_address_locality:
+                  address_locality:
                     active: false
                     label: ''
                   mail:
@@ -197,10 +197,10 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        field_address_family_name:
-          id: field_address_family_name
-          table: profile__field_address
-          field: field_address_family_name
+        address_family_name:
+          id: address_family_name
+          table: profile__address
+          field: address_family_name
           relationship: none
           group_type: group
           admin_label: ''
@@ -246,10 +246,10 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-        field_address_given_name:
-          id: field_address_given_name
-          table: profile__field_address
-          field: field_address_given_name
+        address_given_name:
+          id: address_given_name
+          table: profile__address
+          field: address_given_name
           relationship: none
           group_type: group
           admin_label: ''
@@ -295,10 +295,10 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-        field_address_organization:
-          id: field_address_organization
-          table: profile__field_address
-          field: field_address_organization
+        address_organization:
+          id: address_organization
+          table: profile__address
+          field: address_organization
           relationship: none
           group_type: group
           admin_label: ''
@@ -450,10 +450,10 @@ display:
           text: bewerken
           output_url_as_text: false
           absolute: false
-        field_address_address_line1:
-          id: field_address_address_line1
-          table: profile__field_address
-          field: field_address_address_line1
+        address_address_line1:
+          id: address_address_line1
+          table: profile__address
+          field: address_address_line1
           relationship: none
           group_type: group
           admin_label: ''
@@ -499,10 +499,10 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-        field_address_postal_code:
-          id: field_address_postal_code
-          table: profile__field_address
-          field: field_address_postal_code
+        address_postal_code:
+          id: address_postal_code
+          table: profile__address
+          field: address_postal_code
           relationship: none
           group_type: group
           admin_label: ''
@@ -548,10 +548,10 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-        field_address_locality:
-          id: field_address_locality
-          table: profile__field_address
-          field: field_address_locality
+        address_locality:
+          id: address_locality
+          table: profile__address
+          field: address_locality
           relationship: none
           group_type: group
           admin_label: ''
@@ -1291,9 +1291,9 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           fields:
-            field_address_family_name: field_address_family_name
-            field_address_given_name: field_address_given_name
-            field_address_organization: field_address_organization
+            address_family_name: address_family_name
+            address_given_name: address_given_name
+            address_organization: address_organization
             mail: mail
         field_contact_type_target_id_verf:
           id: field_contact_type_target_id_verf
diff --git a/config/install/views.view.druplan_profile_reference.yml b/config/install/views.view.druplan_profile_reference.yml
index a9abae0c6cf879ae5020fe6dd54463e317b06d83..91ec0b609dd3f901d4a7e970e8d38dd1aebc35bb 100644
--- a/config/install/views.view.druplan_profile_reference.yml
+++ b/config/install/views.view.druplan_profile_reference.yml
@@ -3,7 +3,7 @@ status: true
 dependencies:
   config:
     - profile.type.contact
-    - profile.type.organisation
+    - profile.type.customer
   module:
     - profile
 id: druplan_profile_reference
@@ -311,7 +311,7 @@ display:
           value:
             all: all
             contact: contact
-            organisation: organisation
+            customer: customer
           group: 1
           exposed: false
           expose:
diff --git a/druplan.info.yml b/druplan.info.yml
index 8bd664034924c4e42a527ac9c7e5f4f22e473458..8e1cfe8bc4bb575741887fd273cbc59397952bd7 100644
--- a/druplan.info.yml
+++ b/druplan.info.yml
@@ -76,21 +76,21 @@ config_devel:
     - field.field.node.project.field_genre
     - field.storage.node.field_genre
     - field.field.node.room.body
-    - field.field.profile.contact.field_address
+    - field.field.profile.contact.address
     - field.field.profile.contact.field_contact_type
     - field.field.profile.contact.field_info
     - field.field.profile.contact.field_phone
-    - field.field.profile.organisation.field_address
-    - field.field.profile.organisation.field_e_mail
-    - field.field.profile.organisation.field_phone
-    - field.field.profile.organisation.field_website
-    - field.field.profile.organisation.field_info
-    - field.field.profile.organisation.field_organisation_type
+    - field.field.profile.customer.address
+    - field.field.profile.customer.field_e_mail
+    - field.field.profile.customer.field_phone
+    - field.field.profile.customer.field_website
+    - field.field.profile.customer.field_info
+    - field.field.profile.customer.field_organisation_type
     - field.field.profile.location.field_info
     - field.field.profile.location.field_name
-    - field.field.profile.location.field_address
-    - field.field.profile.organisation.field_locations
-    - field.field.profile.organisation.field_contact_profiles
+    - field.field.profile.location.address
+    - field.field.profile.customer.field_locations
+    - field.field.profile.customer.field_contact_profiles
     - field.field.rp_calendar.location.field_location
     - field.field.rp_calendar.material.field_equipment
     - field.field.rp_calendar.user.field_user
@@ -151,7 +151,7 @@ config_devel:
     - field.storage.node.field_comments
     - field.storage.node.field_images
     - field.storage.node.field_project_status
-    - field.storage.profile.field_address
+    - field.storage.profile.address
     - field.storage.profile.field_contact_type
     - field.storage.profile.field_e_mail
     - field.storage.profile.field_info
@@ -201,7 +201,7 @@ config_devel:
     - node.type.project_group
     - node.type.room
     - profile.type.contact
-    - profile.type.organisation
+    - profile.type.customer
     - profile.type.location
     - resource_planning.rp_calendar_type.default
     - resource_planning.rp_calendar_type.location