diff --git a/src/main/java/org/immregistries/iis/kernal/logic/IncomingMessageHandlerR4.java b/src/main/java/org/immregistries/iis/kernal/logic/IncomingMessageHandlerR4.java
index 4b14cd7d..94a84b51 100644
--- a/src/main/java/org/immregistries/iis/kernal/logic/IncomingMessageHandlerR4.java
+++ b/src/main/java/org/immregistries/iis/kernal/logic/IncomingMessageHandlerR4.java
@@ -437,7 +437,8 @@ public PatientReported processPatient(Tenant tenant, HL7Reader reader, List<Proc
 			String patientNameMiddle = reader.getValue(5, 3);
 			String nameType = reader.getValue(5, 7);
 			if (processingFlavorSet.contains(ProcessingFlavor.APPLESAUCE)) {
-				if (patientNameFirst.toUpperCase().contains("BABY BOY") || patientNameFirst.toUpperCase().contains("BABY GIRL")) {
+				if (patientNameFirst.toUpperCase().contains("BABY BOY") || patientNameFirst.toUpperCase().contains("BABY GIRL") ||
+					patientNameFirst.toUpperCase().contains("BABY")) {
 					nameType = "NB";
 				} else if (patientNameFirst.toUpperCase().contains("TEST")) {
 					nameType = "TEST";
diff --git a/src/main/java/org/immregistries/iis/kernal/model/ProcessingFlavor.java b/src/main/java/org/immregistries/iis/kernal/model/ProcessingFlavor.java
index b108c3e5..a0b883b0 100644
--- a/src/main/java/org/immregistries/iis/kernal/model/ProcessingFlavor.java
+++ b/src/main/java/org/immregistries/iis/kernal/model/ProcessingFlavor.java
@@ -61,6 +61,8 @@ public static Set<ProcessingFlavor> getProcessingStyle(String label) {
 					|| label.endsWith("_" + key)
 					|| label.indexOf("_" + key + "_") > 0) {
 					processingFlavorSet.add(ps);
+				} else if (label.equals(key)) {
+					processingFlavorSet.add(ps);
 				}
 			}
 		}