diff --git a/includes/utilities.php b/includes/utilities.php
index 5867914..0b8d6f1 100644
--- a/includes/utilities.php
+++ b/includes/utilities.php
@@ -36,14 +36,14 @@ function getThematiqueFamilySlug($thematique_slug)
 
 		case "patrimoine":
 		case "erfgoed":
-		case "sante-et-securite":
-		case "gezondheid-en-veiligheid":
+		case "sante-securite-salubrite":
+		case "gezondheid-veiligheid-hygiene":
 		case "aides-financieres":
 		case "financiele-steun":
 			return "patrimoine-sante-securite";
 
-		case "location":
-		case "verhuur":
+		case "location-achat":
+		case "verhuur-ankoop":
 		case "duurzaamheid":
 		case "durabilite":
 			return "location-durabilite";
diff --git a/resources/css/admin-style.css b/resources/css/admin-style.css
index 009f328..b0ed1f1 100644
--- a/resources/css/admin-style.css
+++ b/resources/css/admin-style.css
@@ -204,8 +204,8 @@
   .dagelijks & {
     @apply bg-isolation-quotidien;
   }
-  .location &,
-  .verhuur &,
+  .location-achat &,
+  .verhuur-ankoop &,
   .durabilite &,
   .duurzaamheid & {
     @apply bg-location-durabilite;
@@ -219,8 +219,8 @@
 
   .patrimoine &,
   .erfgoed &,
-  .sante-et-securite &,
-  .gezondheid-en-veiligheid {
+  .sante-securite-salubrite &,
+  .gezondheid-veiligheid-hygiene {
     @apply bg-patrimoine-sante-securite;
   }
 }
diff --git a/resources/css/blocks/page-card.css b/resources/css/blocks/page-card.css
index 0f3e02a..bcd86db 100644
--- a/resources/css/blocks/page-card.css
+++ b/resources/css/blocks/page-card.css
@@ -68,8 +68,8 @@
 
 .post-card--patrimoine,
 .post-card--erfgoed,
-.post-card--sante-et-securite,
-.post-card--gezondheid-en-veiligheid {
+.post-card--sante-securite-salubrite,
+.post-card--gezondheid-veiligheid-hygiene {
   h2.post-card__title {
     @apply text-patrimoine-sante-securite;
   }
diff --git a/resources/css/editor-content/color-taxonomy-scheme.css b/resources/css/editor-content/color-taxonomy-scheme.css
index 037df73..143b3e6 100644
--- a/resources/css/editor-content/color-taxonomy-scheme.css
+++ b/resources/css/editor-content/color-taxonomy-scheme.css
@@ -479,16 +479,16 @@ body.erfgoed,
 .taxonomy-question-page--erfgoed,
 .post-conseil-page--erfgoed,
 .post-question-page--erfgoed,
-body.sante-et-securite,
-.entry-content--sante-et-securite,
-.taxonomy-question-page--sante-et-securite,
-.post-conseil-page--sante-et-securite,
-.post-question-page--sante-et-securite,
-body.gezondheid-en-veiligheid,
-.entry-content--gezondheid-en-veiligheid,
-.taxonomy-question-page--gezondheid-en-veiligheid,
-.post-conseil-page--gezondheid-en-veiligheid,
-.post-question-page--gezondheid-en-veiligheid {
+body.sante-securite-salubrite,
+.entry-content--sante-securite-salubrite,
+.taxonomy-question-page--sante-securite-salubrite,
+.post-conseil-page--sante-securite-salubrite,
+.post-question-page--sante-securite-salubrite,
+body.gezondheid-veiligheid-hygiene,
+.entry-content--gezondheid-veiligheid-hygiene,
+.taxonomy-question-page--gezondheid-veiligheid-hygiene,
+.post-conseil-page--gezondheid-veiligheid-hygiene,
+.post-question-page--gezondheid-veiligheid-hygiene {
   h2,
   h3,
   /* h4, */
@@ -586,8 +586,8 @@ body.gezondheid-en-veiligheid,
 
 .card-news__thematique-tag--patrimoine,
 .card-news__thematique-tag--erfgoed,
-.card-news__thematique-tag--sante-et-securite,
-.card-news__thematique-tag--gezondheid-en-veiligheid {
+.card-news__thematique-tag--sante-securite-salubrite,
+.card-news__thematique-tag--gezondheid-veiligheid-hygiene {
   @apply bg-patrimoine-sante-securite-light text-patrimoine-sante-securite;
 }
 
@@ -619,16 +619,16 @@ body.erfgoed,
   }
 }
 /* LOCATION — SPECIFIC */
-body.sante-et-securite,
-.entry-content--sante-et-securite,
-.taxonomy-question-page--sante-et-securite,
-.post-conseil-page--sante-et-securite,
-.post-question-page--sante-et-securite,
-body.gezondheid-en-veiligheid,
-.entry-content--gezondheid-en-veiligheid,
-.taxonomy-question-page--gezondheid-en-veiligheid,
-.post-conseil-page--gezondheid-en-veiligheid,
-.post-question-page--gezondheid-en-veiligheid {
+body.sante-securite-salubrite,
+.entry-content--sante-securite-salubrite,
+.taxonomy-question-page--sante-securite-salubrite,
+.post-conseil-page--sante-securite-salubrite,
+.post-question-page--sante-securite-salubrite,
+body.gezondheid-veiligheid-hygiene,
+.entry-content--gezondheid-veiligheid-hygiene,
+.taxonomy-question-page--gezondheid-veiligheid-hygiene,
+.post-conseil-page--gezondheid-veiligheid-hygiene,
+.post-question-page--gezondheid-veiligheid-hygiene {
   .post-question-chapter-header,
   .post-conseils-chapter-header {
     @apply bg-patrimoine-sante-securite-light;
@@ -923,8 +923,8 @@ body.duurzaamheid,
   }
   &--patrimoine,
   &--erfgoed,
-  &--sante-et-securite,
-  &--gezondheid-en-veiligheid {
+  &--sante-securite-salubrite,
+  &--gezondheid-veiligheid-hygiene {
     @apply bg-patrimoine-sante-securite-light text-patrimoine-sante-securite;
   }
 }
diff --git a/template-archive-questions.php b/template-archive-questions.php
index 7f10087..925795c 100644
--- a/template-archive-questions.php
+++ b/template-archive-questions.php
@@ -36,8 +36,8 @@ $page_icon = get_field('page_icon', get_queried_object());
 					|| $thematique->slug === "dagelijks"
 					|| $thematique->slug === "aides-financieres"
 					|| $thematique->slug === "financiele-steun"
-					|| $thematique->slug === "gezondheid-en-veiligheid"
-					|| $thematique->slug === "sante-et-securite"
+					|| $thematique->slug === "gezondheid-veiligheid-hygiene"
+					|| $thematique->slug === "sante-securite-salubrite"
 				) continue; ?>
 
 				<?php