diff --git a/src/main/java/org/breedinginsight/daos/TraitDAO.java b/src/main/java/org/breedinginsight/daos/TraitDAO.java
index 443694d58..b362c804e 100644
--- a/src/main/java/org/breedinginsight/daos/TraitDAO.java
+++ b/src/main/java/org/breedinginsight/daos/TraitDAO.java
@@ -316,7 +316,7 @@ public List<Trait> createTraitsBrAPI(List<Trait> traits, User actingUser, Progra
                     .traitDescription(trait.getTraitDescription())
                     .synonyms(trait.getSynonyms())
                     .status("active")
-                    .entity(trait.getEntity())
+                    .entity(trait.getProgramObservationLevel().getName())
                     .mainAbbreviation(trait.getMainAbbreviation())
                     .traitClass(trait.getTraitClass())
                     .externalReferences(List.of(traitReference))
diff --git a/src/main/java/org/breedinginsight/services/TraitService.java b/src/main/java/org/breedinginsight/services/TraitService.java
index 2a8399e45..8d6ebb659 100644
--- a/src/main/java/org/breedinginsight/services/TraitService.java
+++ b/src/main/java/org/breedinginsight/services/TraitService.java
@@ -17,12 +17,12 @@
 
 package org.breedinginsight.services;
 
-import io.micronaut.core.util.StringUtils;
 import io.micronaut.http.HttpStatus;
 import io.micronaut.http.exceptions.HttpStatusException;
 import io.micronaut.http.server.exceptions.HttpServerException;
 import io.micronaut.http.server.exceptions.InternalServerException;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.text.WordUtils;
 import org.brapi.v2.model.pheno.BrAPIObservation;
 import org.breedinginsight.api.auth.AuthenticatedUser;
 import org.breedinginsight.api.model.v1.response.ValidationErrors;
@@ -242,11 +242,11 @@ public void assignTraitsProgramObservationLevel(List<Trait> traits, UUID program
                 if (matchingLevels.size() == 0) {
                     // If doesn't exist, save it without an id. We will create it later
                     ProgramObservationLevel programObservationLevel = new ProgramObservationLevel();
-                    programObservationLevel.setName(StringUtils.capitalize(trait.getProgramObservationLevel().getName().toLowerCase()));
+                    programObservationLevel.setName(WordUtils.capitalize(trait.getProgramObservationLevel().getName().toLowerCase()));
                     trait.setProgramObservationLevel(programObservationLevel);
                 } else {
                     ProgramObservationLevel dbLevel = matchingLevels.get(0);
-                    trait.getProgramObservationLevel().setName(StringUtils.capitalize(trait.getProgramObservationLevel().getName().toLowerCase()));
+                    trait.getProgramObservationLevel().setName(dbLevel.getName());
                     trait.getProgramObservationLevel().setId(dbLevel.getId());
                 }
             }
diff --git a/src/test/java/org/breedinginsight/api/v1/controller/TraitControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/TraitControllerIntegrationTest.java
index 300a5eee1..db8533b98 100644
--- a/src/test/java/org/breedinginsight/api/v1/controller/TraitControllerIntegrationTest.java
+++ b/src/test/java/org/breedinginsight/api/v1/controller/TraitControllerIntegrationTest.java
@@ -1284,7 +1284,7 @@ public void putTraitComputation() {
         updateTrait.setTraitDescription("Updated description");
         updateTrait.setEntity("Updated entity");
         updateTrait.setObservationVariableName("Updated name");
-        updateTrait.setProgramObservationLevel(ProgramObservationLevel.builder().name("Updated level").build());
+        updateTrait.setProgramObservationLevel(ProgramObservationLevel.builder().name("Updated Level").build());
         updateTrait.getScale().setScaleName("Updated Scale");
         updateTrait.getScale().setDataType(DataType.DATE);
         updateTrait.getMethod().setDescription("A method");
@@ -1418,7 +1418,7 @@ public void putTraitIdDoesNotExist() {
 
         updateTrait.setId(UUID.randomUUID());
         updateTrait.setObservationVariableName("Update Name");
-        updateTrait.setProgramObservationLevel(ProgramObservationLevel.builder().name("Updated level").build());
+        updateTrait.setProgramObservationLevel(ProgramObservationLevel.builder().name("Updated Level").build());
         updateTrait.getScale().setScaleName("Updated Scale");
         updateTrait.getScale().setDataType(DataType.DATE);
         updateTrait.getMethod().setDescription("A method");