diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java
index 44bd79a..61b6dfa 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java
@@ -104,9 +104,9 @@ public class RSSPoc2Service {
             resultMap.put("Experimental_Completion_Date", getExperimentalEndDate(redactionLog));
             resultMap.put("GLP_Study", getGlpStudy(redactionLog));
             resultMap.put("Certificate_of_Analysis,_Batch_Identification", getBatchNumber(redactionLog));
-            resultMap.put("TEST_GUIDELINE(S):_1", getTestGuideline1(redactionLog));
+            resultMap.put("TEST_GUIDELINES_1", getTestGuideline1(redactionLog));
             var testGuideline2 = getTestGuideline2(redactionLog);
-            resultMap.put("TEST_GUIDELINE(S):_2", testGuideline2 == null ? "" : testGuideline2);
+            resultMap.put("TEST_GUIDELINES_2", testGuideline2 == null ? "" : testGuideline2);
 
             if (oecdIn(oecd, Set.of("402", "403", "404", "405", "425", "429", "436", "471"))) {
 
@@ -115,7 +115,7 @@ public class RSSPoc2Service {
                 var guidelineDeviationSentences = getAsSentences(redactionLog, "guideline_deviation");
                 int i = 1;
                 for (String guidelineDeviationSentence : guidelineDeviationSentences) {
-                    resultMap.put("Deviation_from_the_Guideline_(Study_Plan)_" + i, guidelineDeviationSentence);
+                    resultMap.put("Deviation_from_the_Guideline_Study_Plan_" + i, guidelineDeviationSentence);
                     i++;
                 }
             }
@@ -127,10 +127,10 @@ public class RSSPoc2Service {
             }
 
             if (oecdIn(oecd, Set.of("402", "403", "425", "436"))) {
-                resultMap.put("Conclusion_-_LD50_(mg/L)", getLd50Value(redactionLog));
-                resultMap.put("Conclusion -LD50_Greater_than", getLd50GreaterThan(redactionLog));
-                resultMap.put("Conclusion_-_Minimum_Confidence", getConfidenceMinimal(redactionLog));
-                resultMap.put("Conclusion_-_Maximum_Confidence", getConfidenceMaximal(redactionLog));
+                resultMap.put("Conclusion_LD50_mg_per_l", getLd50Value(redactionLog));
+                resultMap.put("Conclusion_LD50_Greater_than", getLd50GreaterThan(redactionLog));
+                resultMap.put("Conclusion_Minimum_Confidence", getConfidenceMinimal(redactionLog));
+                resultMap.put("Conclusion_Maximum_Confidence", getConfidenceMaximal(redactionLog));
             }
 
 
@@ -139,7 +139,7 @@ public class RSSPoc2Service {
             }
 
             if (oecdIn(oecd, Set.of("403", "436"))) {
-                resultMap.put("Conducted_with_4_hours_of_Exposure?", getAsOneBlock(redactionLog, "4h_exposure"));
+                resultMap.put("Conducted_with_4_hours_of_Exposure", getAsOneBlock(redactionLog, "4h_exposure"));
             }
 
 
@@ -171,7 +171,7 @@ public class RSSPoc2Service {
                 int i = 1;
                 while (effectiveConcentrationsIterator.hasNext()) {
                     String effectiveConcentration = effectiveConcentrationsIterator.next();
-                    resultMap.put("Effective_Concentration_(mg/L_of_air)_" + i, effectiveConcentration);
+                    resultMap.put("Effective_Concentration_mg_per_l_of_air_" + i, effectiveConcentration);
                     i++;
                 }
 
@@ -191,7 +191,7 @@ public class RSSPoc2Service {
             }
 
             if (oecdIn(oecd, Set.of("404"))) {
-                resultMap.put("Dose_(ml/animal)", getDoseMlPerAnimal(redactionLog));
+                resultMap.put("Dose_ml_per_animal", getDoseMlPerAnimal(redactionLog));
 //                resultMap.put("Was_there_dilution_of_the_test_substance?", getDilution(redactionLog)); // Out of scope.
                 resultMap.put("Detailing_of_reported_changes", getAsOneBlock(redactionLog, "detailing"));
             }
@@ -233,7 +233,7 @@ public class RSSPoc2Service {
                 }
 
                 resultMap.put("Test_results", getAsOneBlock(redactionLog, "test_results"));
-                resultMap.put("Was_the_definitive_study_conducted_with_positive_control?", getAsOneBlock(redactionLog, "positive_control"));
+                resultMap.put("Was_the_definitive_study_conducted_with_positive_control", getAsOneBlock(redactionLog, "positive_control"));
             }
 
             rssFileResponses.add(new RSSFileResponse(file.getFilename(), resultMap));