diff --git a/features/opencase_default_subtypes_activity_subtypes/config/install/core.entity_form_display.activity.case_note.default.yml b/features/opencase_default_subtypes/config/install/core.entity_form_display.activity.case_note.default.yml
similarity index 100%
rename from features/opencase_default_subtypes_activity_subtypes/config/install/core.entity_form_display.activity.case_note.default.yml
rename to features/opencase_default_subtypes/config/install/core.entity_form_display.activity.case_note.default.yml
diff --git a/features/opencase_default_subtypes_activity_subtypes/config/install/core.entity_form_display.activity.self_assessment.default.yml b/features/opencase_default_subtypes/config/install/core.entity_form_display.activity.self_assessment.default.yml
similarity index 100%
rename from features/opencase_default_subtypes_activity_subtypes/config/install/core.entity_form_display.activity.self_assessment.default.yml
rename to features/opencase_default_subtypes/config/install/core.entity_form_display.activity.self_assessment.default.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/core.entity_form_display.case_entity.asylum.default.yml b/features/opencase_default_subtypes/config/install/core.entity_form_display.case_entity.asylum.default.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/core.entity_form_display.case_entity.asylum.default.yml
rename to features/opencase_default_subtypes/config/install/core.entity_form_display.case_entity.asylum.default.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/core.entity_form_display.case_entity.housing.default.yml b/features/opencase_default_subtypes/config/install/core.entity_form_display.case_entity.housing.default.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/core.entity_form_display.case_entity.housing.default.yml
rename to features/opencase_default_subtypes/config/install/core.entity_form_display.case_entity.housing.default.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/core.entity_form_display.case_entity.volunteer_recruitment.default.yml b/features/opencase_default_subtypes/config/install/core.entity_form_display.case_entity.volunteer_recruitment.default.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/core.entity_form_display.case_entity.volunteer_recruitment.default.yml
rename to features/opencase_default_subtypes/config/install/core.entity_form_display.case_entity.volunteer_recruitment.default.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/core.entity_form_display.hat.client.default.yml b/features/opencase_default_subtypes/config/install/core.entity_form_display.hat.client.default.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/core.entity_form_display.hat.client.default.yml
rename to features/opencase_default_subtypes/config/install/core.entity_form_display.hat.client.default.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/core.entity_form_display.hat.volunteer.default.yml b/features/opencase_default_subtypes/config/install/core.entity_form_display.hat.volunteer.default.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/core.entity_form_display.hat.volunteer.default.yml
rename to features/opencase_default_subtypes/config/install/core.entity_form_display.hat.volunteer.default.yml
diff --git a/features/opencase_default_subtypes_activity_subtypes/config/install/core.entity_view_display.activity.case_note.default.yml b/features/opencase_default_subtypes/config/install/core.entity_view_display.activity.case_note.default.yml
similarity index 100%
rename from features/opencase_default_subtypes_activity_subtypes/config/install/core.entity_view_display.activity.case_note.default.yml
rename to features/opencase_default_subtypes/config/install/core.entity_view_display.activity.case_note.default.yml
diff --git a/features/opencase_default_subtypes_activity_subtypes/config/install/core.entity_view_display.activity.self_assessment.default.yml b/features/opencase_default_subtypes/config/install/core.entity_view_display.activity.self_assessment.default.yml
similarity index 100%
rename from features/opencase_default_subtypes_activity_subtypes/config/install/core.entity_view_display.activity.self_assessment.default.yml
rename to features/opencase_default_subtypes/config/install/core.entity_view_display.activity.self_assessment.default.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/core.entity_view_display.case_entity.asylum.default.yml b/features/opencase_default_subtypes/config/install/core.entity_view_display.case_entity.asylum.default.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/core.entity_view_display.case_entity.asylum.default.yml
rename to features/opencase_default_subtypes/config/install/core.entity_view_display.case_entity.asylum.default.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/core.entity_view_display.case_entity.housing.default.yml b/features/opencase_default_subtypes/config/install/core.entity_view_display.case_entity.housing.default.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/core.entity_view_display.case_entity.housing.default.yml
rename to features/opencase_default_subtypes/config/install/core.entity_view_display.case_entity.housing.default.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/core.entity_view_display.case_entity.volunteer_recruitment.default.yml b/features/opencase_default_subtypes/config/install/core.entity_view_display.case_entity.volunteer_recruitment.default.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/core.entity_view_display.case_entity.volunteer_recruitment.default.yml
rename to features/opencase_default_subtypes/config/install/core.entity_view_display.case_entity.volunteer_recruitment.default.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/core.entity_view_display.hat.client.default.yml b/features/opencase_default_subtypes/config/install/core.entity_view_display.hat.client.default.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/core.entity_view_display.hat.client.default.yml
rename to features/opencase_default_subtypes/config/install/core.entity_view_display.hat.client.default.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/core.entity_view_display.hat.volunteer.default.yml b/features/opencase_default_subtypes/config/install/core.entity_view_display.hat.volunteer.default.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/core.entity_view_display.hat.volunteer.default.yml
rename to features/opencase_default_subtypes/config/install/core.entity_view_display.hat.volunteer.default.yml
diff --git a/features/opencase_default_subtypes_activity_subtypes/config/install/field.field.activity.case_note.field_file.yml b/features/opencase_default_subtypes/config/install/field.field.activity.case_note.field_file.yml
similarity index 100%
rename from features/opencase_default_subtypes_activity_subtypes/config/install/field.field.activity.case_note.field_file.yml
rename to features/opencase_default_subtypes/config/install/field.field.activity.case_note.field_file.yml
diff --git a/features/opencase_default_subtypes_activity_subtypes/config/install/field.field.activity.case_note.field_notes.yml b/features/opencase_default_subtypes/config/install/field.field.activity.case_note.field_notes.yml
similarity index 100%
rename from features/opencase_default_subtypes_activity_subtypes/config/install/field.field.activity.case_note.field_notes.yml
rename to features/opencase_default_subtypes/config/install/field.field.activity.case_note.field_notes.yml
diff --git a/features/opencase_default_subtypes_activity_subtypes/config/install/field.field.activity.self_assessment.field_how_is_your_housing_situat.yml b/features/opencase_default_subtypes/config/install/field.field.activity.self_assessment.field_how_is_your_housing_situat.yml
similarity index 100%
rename from features/opencase_default_subtypes_activity_subtypes/config/install/field.field.activity.self_assessment.field_how_is_your_housing_situat.yml
rename to features/opencase_default_subtypes/config/install/field.field.activity.self_assessment.field_how_is_your_housing_situat.yml
diff --git a/features/opencase_default_subtypes_activity_subtypes/config/install/field.field.activity.self_assessment.field_how_is_your_mental_health_.yml b/features/opencase_default_subtypes/config/install/field.field.activity.self_assessment.field_how_is_your_mental_health_.yml
similarity index 100%
rename from features/opencase_default_subtypes_activity_subtypes/config/install/field.field.activity.self_assessment.field_how_is_your_mental_health_.yml
rename to features/opencase_default_subtypes/config/install/field.field.activity.self_assessment.field_how_is_your_mental_health_.yml
diff --git a/features/opencase_default_subtypes_activity_subtypes/config/install/field.field.activity.self_assessment.field_how_is_your_physical_healt.yml b/features/opencase_default_subtypes/config/install/field.field.activity.self_assessment.field_how_is_your_physical_healt.yml
similarity index 100%
rename from features/opencase_default_subtypes_activity_subtypes/config/install/field.field.activity.self_assessment.field_how_is_your_physical_healt.yml
rename to features/opencase_default_subtypes/config/install/field.field.activity.self_assessment.field_how_is_your_physical_healt.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/field.field.case_entity.asylum.field_asyl.yml b/features/opencase_default_subtypes/config/install/field.field.case_entity.asylum.field_asyl.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/field.field.case_entity.asylum.field_asyl.yml
rename to features/opencase_default_subtypes/config/install/field.field.case_entity.asylum.field_asyl.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/field.field.case_entity.asylum.field_home_offi.yml b/features/opencase_default_subtypes/config/install/field.field.case_entity.asylum.field_home_offi.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/field.field.case_entity.asylum.field_home_offi.yml
rename to features/opencase_default_subtypes/config/install/field.field.case_entity.asylum.field_home_offi.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/field.field.hat.client.field_country.yml b/features/opencase_default_subtypes/config/install/field.field.hat.client.field_country.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/field.field.hat.client.field_country.yml
rename to features/opencase_default_subtypes/config/install/field.field.hat.client.field_country.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/field.field.hat.client.field_language.yml b/features/opencase_default_subtypes/config/install/field.field.hat.client.field_language.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/field.field.hat.client.field_language.yml
rename to features/opencase_default_subtypes/config/install/field.field.hat.client.field_language.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/field.field.hat.volunteer.field_availability.yml b/features/opencase_default_subtypes/config/install/field.field.hat.volunteer.field_availability.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/field.field.hat.volunteer.field_availability.yml
rename to features/opencase_default_subtypes/config/install/field.field.hat.volunteer.field_availability.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/field.field.hat.volunteer.field_date_started.yml b/features/opencase_default_subtypes/config/install/field.field.hat.volunteer.field_date_started.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/field.field.hat.volunteer.field_date_started.yml
rename to features/opencase_default_subtypes/config/install/field.field.hat.volunteer.field_date_started.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/field.field.hat.volunteer.field_team.yml b/features/opencase_default_subtypes/config/install/field.field.hat.volunteer.field_team.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/field.field.hat.volunteer.field_team.yml
rename to features/opencase_default_subtypes/config/install/field.field.hat.volunteer.field_team.yml
diff --git a/features/opencase_default_subtypes_activity_subtypes/config/install/field.storage.activity.field_file.yml b/features/opencase_default_subtypes/config/install/field.storage.activity.field_file.yml
similarity index 100%
rename from features/opencase_default_subtypes_activity_subtypes/config/install/field.storage.activity.field_file.yml
rename to features/opencase_default_subtypes/config/install/field.storage.activity.field_file.yml
diff --git a/features/opencase_default_subtypes_activity_subtypes/config/install/field.storage.activity.field_how_is_your_housing_situat.yml b/features/opencase_default_subtypes/config/install/field.storage.activity.field_how_is_your_housing_situat.yml
similarity index 100%
rename from features/opencase_default_subtypes_activity_subtypes/config/install/field.storage.activity.field_how_is_your_housing_situat.yml
rename to features/opencase_default_subtypes/config/install/field.storage.activity.field_how_is_your_housing_situat.yml
diff --git a/features/opencase_default_subtypes_activity_subtypes/config/install/field.storage.activity.field_how_is_your_mental_health_.yml b/features/opencase_default_subtypes/config/install/field.storage.activity.field_how_is_your_mental_health_.yml
similarity index 100%
rename from features/opencase_default_subtypes_activity_subtypes/config/install/field.storage.activity.field_how_is_your_mental_health_.yml
rename to features/opencase_default_subtypes/config/install/field.storage.activity.field_how_is_your_mental_health_.yml
diff --git a/features/opencase_default_subtypes_activity_subtypes/config/install/field.storage.activity.field_how_is_your_physical_healt.yml b/features/opencase_default_subtypes/config/install/field.storage.activity.field_how_is_your_physical_healt.yml
similarity index 100%
rename from features/opencase_default_subtypes_activity_subtypes/config/install/field.storage.activity.field_how_is_your_physical_healt.yml
rename to features/opencase_default_subtypes/config/install/field.storage.activity.field_how_is_your_physical_healt.yml
diff --git a/features/opencase_default_subtypes_activity_subtypes/config/install/field.storage.activity.field_notes.yml b/features/opencase_default_subtypes/config/install/field.storage.activity.field_notes.yml
similarity index 100%
rename from features/opencase_default_subtypes_activity_subtypes/config/install/field.storage.activity.field_notes.yml
rename to features/opencase_default_subtypes/config/install/field.storage.activity.field_notes.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/field.storage.case_entity.field_asyl.yml b/features/opencase_default_subtypes/config/install/field.storage.case_entity.field_asyl.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/field.storage.case_entity.field_asyl.yml
rename to features/opencase_default_subtypes/config/install/field.storage.case_entity.field_asyl.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/field.storage.case_entity.field_home_offi.yml b/features/opencase_default_subtypes/config/install/field.storage.case_entity.field_home_offi.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/field.storage.case_entity.field_home_offi.yml
rename to features/opencase_default_subtypes/config/install/field.storage.case_entity.field_home_offi.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/field.storage.hat.field_availability.yml b/features/opencase_default_subtypes/config/install/field.storage.hat.field_availability.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/field.storage.hat.field_availability.yml
rename to features/opencase_default_subtypes/config/install/field.storage.hat.field_availability.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/field.storage.hat.field_country.yml b/features/opencase_default_subtypes/config/install/field.storage.hat.field_country.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/field.storage.hat.field_country.yml
rename to features/opencase_default_subtypes/config/install/field.storage.hat.field_country.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/field.storage.hat.field_date_started.yml b/features/opencase_default_subtypes/config/install/field.storage.hat.field_date_started.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/field.storage.hat.field_date_started.yml
rename to features/opencase_default_subtypes/config/install/field.storage.hat.field_date_started.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/field.storage.hat.field_language.yml b/features/opencase_default_subtypes/config/install/field.storage.hat.field_language.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/field.storage.hat.field_language.yml
rename to features/opencase_default_subtypes/config/install/field.storage.hat.field_language.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/field.storage.hat.field_team.yml b/features/opencase_default_subtypes/config/install/field.storage.hat.field_team.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/field.storage.hat.field_team.yml
rename to features/opencase_default_subtypes/config/install/field.storage.hat.field_team.yml
diff --git a/features/opencase_default_subtypes_activity_subtypes/config/install/zencrm_entities.activity_type.case_note.yml b/features/opencase_default_subtypes/config/install/zencrm_entities.activity_type.case_note.yml
similarity index 100%
rename from features/opencase_default_subtypes_activity_subtypes/config/install/zencrm_entities.activity_type.case_note.yml
rename to features/opencase_default_subtypes/config/install/zencrm_entities.activity_type.case_note.yml
diff --git a/features/opencase_default_subtypes_activity_subtypes/config/install/zencrm_entities.activity_type.self_assessment.yml b/features/opencase_default_subtypes/config/install/zencrm_entities.activity_type.self_assessment.yml
similarity index 100%
rename from features/opencase_default_subtypes_activity_subtypes/config/install/zencrm_entities.activity_type.self_assessment.yml
rename to features/opencase_default_subtypes/config/install/zencrm_entities.activity_type.self_assessment.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/zencrm_entities.case_entity_type.asylum.yml b/features/opencase_default_subtypes/config/install/zencrm_entities.case_entity_type.asylum.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/zencrm_entities.case_entity_type.asylum.yml
rename to features/opencase_default_subtypes/config/install/zencrm_entities.case_entity_type.asylum.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/zencrm_entities.case_entity_type.housing.yml b/features/opencase_default_subtypes/config/install/zencrm_entities.case_entity_type.housing.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/zencrm_entities.case_entity_type.housing.yml
rename to features/opencase_default_subtypes/config/install/zencrm_entities.case_entity_type.housing.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/zencrm_entities.case_entity_type.volunteer_recruitment.yml b/features/opencase_default_subtypes/config/install/zencrm_entities.case_entity_type.volunteer_recruitment.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/zencrm_entities.case_entity_type.volunteer_recruitment.yml
rename to features/opencase_default_subtypes/config/install/zencrm_entities.case_entity_type.volunteer_recruitment.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/zencrm_entities.hat_type.client.yml b/features/opencase_default_subtypes/config/install/zencrm_entities.hat_type.client.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/zencrm_entities.hat_type.client.yml
rename to features/opencase_default_subtypes/config/install/zencrm_entities.hat_type.client.yml
diff --git a/features/opencase_default_subtypes_case_subtypes/config/install/zencrm_entities.hat_type.volunteer.yml b/features/opencase_default_subtypes/config/install/zencrm_entities.hat_type.volunteer.yml
similarity index 100%
rename from features/opencase_default_subtypes_case_subtypes/config/install/zencrm_entities.hat_type.volunteer.yml
rename to features/opencase_default_subtypes/config/install/zencrm_entities.hat_type.volunteer.yml
diff --git a/features/opencase_user_config_anonymous/opencase_user_config_anonymous.features.yml b/features/opencase_default_subtypes/opencase_default_subtypes.features.yml
similarity index 88%
rename from features/opencase_user_config_anonymous/opencase_user_config_anonymous.features.yml
rename to features/opencase_default_subtypes/opencase_default_subtypes.features.yml
index 96f8ceb..50fe1db 100644
--- a/features/opencase_user_config_anonymous/opencase_user_config_anonymous.features.yml
+++ b/features/opencase_default_subtypes/opencase_default_subtypes.features.yml
@@ -1,4 +1,4 @@
-bundle: opencase_user_config
+bundle: opencase
 excluded:
   - block.block.views_block__single_case_with_activities_block_1
   - block.block.views_block__this_person_s_contact_details_block_1
diff --git a/features/opencase_default_subtypes_case_subtypes/opencase_default_subtypes_case_subtypes.info.yml b/features/opencase_default_subtypes/opencase_default_subtypes.info.yml
similarity index 65%
rename from features/opencase_default_subtypes_case_subtypes/opencase_default_subtypes_case_subtypes.info.yml
rename to features/opencase_default_subtypes/opencase_default_subtypes.info.yml
index 1079eb3..51fe2cf 100644
--- a/features/opencase_default_subtypes_case_subtypes/opencase_default_subtypes_case_subtypes.info.yml
+++ b/features/opencase_default_subtypes/opencase_default_subtypes.info.yml
@@ -1,4 +1,4 @@
-name: 'Hat Subtypes'
+name: 'Default Subtypes'
 type: module
 core: 8.x
 dependencies:
@@ -8,4 +8,4 @@ dependencies:
   - system
   - views
   - zencrm_entities
-package: 'OpenCase Default Subtypes'
+package: 'OpenCase'
diff --git a/features/opencase_default_subtypes_activity_subtypes/opencase_default_subtypes_activity_subtypes.info.yml b/features/opencase_default_subtypes_activity_subtypes/opencase_default_subtypes_activity_subtypes.info.yml
deleted file mode 100644
index 58f242e..0000000
--- a/features/opencase_default_subtypes_activity_subtypes/opencase_default_subtypes_activity_subtypes.info.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: 'Activity Subtypes'
-type: module
-core: 8.x
-dependencies:
-  - block
-  - field
-  - file
-  - options
-  - system
-  - views
-  - zencrm_entities
-package: 'OpenCase Default Subtypes'
diff --git a/features/opencase_default_subtypes_case_subtypes/opencase_default_subtypes_case_subtypes.features.yml b/features/opencase_default_subtypes_case_subtypes/opencase_default_subtypes_case_subtypes.features.yml
deleted file mode 100644
index 5e04606..0000000
--- a/features/opencase_default_subtypes_case_subtypes/opencase_default_subtypes_case_subtypes.features.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-bundle: opencase_default_subtypes
-excluded:
-  - block.block.views_block__single_case_with_activities_block_1
-  - block.block.views_block__this_person_s_contact_details_block_1
-  - block.block.views_block__this_person_s_hats_block_1
-required: true
diff --git a/features/opencase_user_config_anonymous/config/install/user.role.anonymous.yml b/features/opencase_default_user_config/config/install/user.role.anonymous.yml
similarity index 100%
rename from features/opencase_user_config_anonymous/config/install/user.role.anonymous.yml
rename to features/opencase_default_user_config/config/install/user.role.anonymous.yml
diff --git a/features/opencase_default_subtypes_activity_subtypes/opencase_default_subtypes_activity_subtypes.features.yml b/features/opencase_default_user_config/opencase_default_user_config.features.yml
similarity index 86%
rename from features/opencase_default_subtypes_activity_subtypes/opencase_default_subtypes_activity_subtypes.features.yml
rename to features/opencase_default_user_config/opencase_default_user_config.features.yml
index 5e04606..50fe1db 100644
--- a/features/opencase_default_subtypes_activity_subtypes/opencase_default_subtypes_activity_subtypes.features.yml
+++ b/features/opencase_default_user_config/opencase_default_user_config.features.yml
@@ -1,4 +1,4 @@
-bundle: opencase_default_subtypes
+bundle: opencase
 excluded:
   - block.block.views_block__single_case_with_activities_block_1
   - block.block.views_block__this_person_s_contact_details_block_1
diff --git a/features/opencase_user_config_anonymous/opencase_user_config_anonymous.info.yml b/features/opencase_default_user_config/opencase_default_user_config.info.yml
similarity index 61%
rename from features/opencase_user_config_anonymous/opencase_user_config_anonymous.info.yml
rename to features/opencase_default_user_config/opencase_default_user_config.info.yml
index 6e240f9..35eea3f 100644
--- a/features/opencase_user_config_anonymous/opencase_user_config_anonymous.info.yml
+++ b/features/opencase_default_user_config/opencase_default_user_config.info.yml
@@ -1,4 +1,4 @@
-name: anonymous
+name: default_user_config
 type: module
 core: 8.x
 dependencies:
@@ -6,4 +6,4 @@ dependencies:
   - system
   - user
   - views
-package: 'OpenCase User Config'
+package: 'OpenCase'