diff --git a/content/configuration/backend_configuration/messageproperties/messages_en.properties b/content/configuration/backend_configuration/messageproperties/messages_en.properties
index cda8d521..f6267abf 100644
--- a/content/configuration/backend_configuration/messageproperties/messages_en.properties
+++ b/content/configuration/backend_configuration/messageproperties/messages_en.properties
@@ -2551,10 +2551,10 @@ ui.i18n.Form.name.8546c641-525c-474c-8696-79a60b65b6b0=Check-In
 ui.i18n.Form.name.4d778ef4-0620-11e5-a6c0-1697f925ec7b=Lab Results
 ui.i18n.Form.name.5e1b0c3a-3acf-4e50-aab1-738a3a282dea=Lab Results
 ui.i18n.Form.name.cccc5c38-eb32-11e2-981f-96c0fcb18276=Consult Provider and Date
-ui.i18n.Form.name.40f51770-0267-11e6-a837-0800200c9a66=Outpatient Intake (Adult)
-ui.i18n.Form.name.343ba950-0324-11e6-a837-0800200c9a66=Outpatient Followup (Adult)
-ui.i18n.Form.name.58f731af-8f8e-4863-b721-70bca76699c4=Outpatient Intake (Peds)
-ui.i18n.Form.name.65b51111-0324-11e6-a837-0800200c9a66=Outpatient Followup (Peds)
+ui.i18n.Form.name.40f51770-0267-11e6-a837-0800200c9a66=Intake (Adult)
+ui.i18n.Form.name.343ba950-0324-11e6-a837-0800200c9a66=Followup (Adult)
+ui.i18n.Form.name.58f731af-8f8e-4863-b721-70bca76699c4=Intake (Peds)
+ui.i18n.Form.name.65b51111-0324-11e6-a837-0800200c9a66=Followup (Peds)
 ui.i18n.Form.name.71ee5c0c-d8ae-4777-af9f-bb57f563503a=Chief Complaint
 ui.i18n.Form.name.8F2EF81B-AA69-49DD-809D-77647BA70765=Primary Care Disposition
 ui.i18n.Form.name.3498f204-a6fa-4df0-b7fd-a94eb03a43c9=Diagnosis
@@ -3882,10 +3882,10 @@ ui.i18n.EncounterType.name.616b66fe-f189-11e7-8c3f-9a214cf093ae=HIV CT
 # ui.i18n.EncounterType.name.616b66fe-f189-11e7-8c3f-9a214cf093ae=HIV Counseling and Testing (CT)
 ui.i18n.EncounterType.name.2fb72359-f6fe-4b37-bb11-9b4cb5fd6ca7=PrEP Initial
 ui.i18n.EncounterType.name.4fe5fc03-b42b-4bb2-8ed8-e3c7de8942fb=PrEP Followup
-ui.i18n.EncounterType.name.5b812660-0262-11e6-a837-0800200c9a66=Outpatient Intake (Peds)
-ui.i18n.EncounterType.name.229e5160-031b-11e6-a837-0800200c9a66=Outpatient Followup (Peds)
-ui.i18n.EncounterType.name.27d3a180-031b-11e6-a837-0800200c9a66=Outpatient Intake (Adult)
-ui.i18n.EncounterType.name.27d3a181-031b-11e6-a837-0800200c9a66=Outpatient Followup (Adult)
+ui.i18n.EncounterType.name.5b812660-0262-11e6-a837-0800200c9a66=Intake (Peds)
+ui.i18n.EncounterType.name.229e5160-031b-11e6-a837-0800200c9a66=Followup (Peds)
+ui.i18n.EncounterType.name.27d3a180-031b-11e6-a837-0800200c9a66=Intake (Adult)
+ui.i18n.EncounterType.name.27d3a181-031b-11e6-a837-0800200c9a66=Followup (Adult)
 ui.i18n.EncounterType.name.74cef0a6-2801-11e6-b67b-9e71128cae77=ED Triage
 ui.i18n.EncounterType.name.b3a0e3ad-b80c-4f3f-9626-ace1ced7e2dd=Test Order
 ui.i18n.EncounterType.name.10db3139-07c0-4766-b4e5-a41b01363145=Pathology Specimen Collection
diff --git a/content/configuration/backend_configuration/messageproperties/messages_fr.properties b/content/configuration/backend_configuration/messageproperties/messages_fr.properties
index d54cac07..4b42f5bd 100644
--- a/content/configuration/backend_configuration/messageproperties/messages_fr.properties
+++ b/content/configuration/backend_configuration/messageproperties/messages_fr.properties
@@ -3693,10 +3693,10 @@ ui.i18n.EncounterType.name.616b66fe-f189-11e7-8c3f-9a214cf093ae=VIH CD
 ui.i18n.EncounterType.name.2fb72359-f6fe-4b37-bb11-9b4cb5fd6ca7=PrEP Données de Base
 ui.i18n.EncounterType.name.4fe5fc03-b42b-4bb2-8ed8-e3c7de8942fb=PrEP Fiche de Suivi
 ui.i18n.EncounterType.name.83081f7d-ffd7-4d43-9571-a86e1bc19d7f=VIH Évaluation Psychosociale
-ui.i18n.EncounterType.name.5b812660-0262-11e6-a837-0800200c9a66=Externe Initiale Pédiatrique
-ui.i18n.EncounterType.name.229e5160-031b-11e6-a837-0800200c9a66=Externe de Suivi Pédiatrique
-ui.i18n.EncounterType.name.27d3a180-031b-11e6-a837-0800200c9a66=Externe Initiale Adulte
-ui.i18n.EncounterType.name.27d3a181-031b-11e6-a837-0800200c9a66=Externe de Suivi Adulte
+ui.i18n.EncounterType.name.5b812660-0262-11e6-a837-0800200c9a66=Initiale Pédiatrique
+ui.i18n.EncounterType.name.229e5160-031b-11e6-a837-0800200c9a66=Suivi Pédiatrique
+ui.i18n.EncounterType.name.27d3a180-031b-11e6-a837-0800200c9a66=Initiale Adulte
+ui.i18n.EncounterType.name.27d3a181-031b-11e6-a837-0800200c9a66=Suivi Adulte
 ui.i18n.EncounterType.name.74cef0a6-2801-11e6-b67b-9e71128cae77=Triage des Urgences
 ui.i18n.EncounterType.name.b3a0e3ad-b80c-4f3f-9626-ace1ced7e2dd=Commandes d'analyse
 ui.i18n.EncounterType.name.e0b41238-905a-497b-a2b6-885994701b99=Médicaments ordonnance