diff --git a/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JAConditionalSignalUpdateGAM/JAConditionalSignalUpdateGAM.cpp b/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JAConditionalSignalUpdateGAM/JAConditionalSignalUpdateGAM.cpp
index 2172f1e..d445a7e 100644
--- a/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JAConditionalSignalUpdateGAM/JAConditionalSignalUpdateGAM.cpp
+++ b/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JAConditionalSignalUpdateGAM/JAConditionalSignalUpdateGAM.cpp
@@ -128,7 +128,7 @@ bool JAConditionalSignalUpdateGAM::Initialise(MARTe::StructuredDataI &data) {
       level++;
       uint32 n_inputs = data.GetNumberOfChildren();
       comparators = new comparator_t[n_inputs];
-      StreamString buffer;
+      StreamString strbuff;
       TypeDescriptor td;
       for (uint32 i = 0; ok && i < n_inputs; i++) {
         ok = data.MoveToChild(i);
@@ -138,14 +138,14 @@ bool JAConditionalSignalUpdateGAM::Initialise(MARTe::StructuredDataI &data) {
           break;
         }
         level++;
-        ok = data.Read("Type", buffer);
+        ok = data.Read("Type", strbuff);
         if (!ok) {
           REPORT_ERROR(ErrorManagement::ParametersError,
                        "Missing mandatory field Type from InputSignals[%lu]",
                        i);
           break;
         }
-        td = TypeDescriptor::GetTypeDescriptorFromTypeName(buffer.Buffer());
+        td = TypeDescriptor::GetTypeDescriptorFromTypeName(strbuff.Buffer());
         ok = (td == UnsignedInteger8Bit) || (td == UnsignedInteger16Bit) ||
              (td == UnsignedInteger32Bit);
         if (!ok) {
@@ -153,19 +153,19 @@ bool JAConditionalSignalUpdateGAM::Initialise(MARTe::StructuredDataI &data) {
                        "Wrong value for  field Type from InputSignals[%d]", i);
           break;
         }
-        buffer = "";
-        ok = data.Read("Comparator", buffer);
+        strbuff = "";
+        ok = data.Read("Comparator", strbuff);
         if (!ok) {
           REPORT_ERROR(
               ErrorManagement::ParametersError,
               "Missing mandatory field Comparator from InputSignals[%d]", i);
           break;
         }
-        ok = parse_comparator(buffer, comparators[i].comparator);
+        ok = parse_comparator(strbuff, comparators[i].comparator);
         if (!ok) {
           REPORT_ERROR(ErrorManagement::ParametersError,
                        "Non Valid Comparator `%s` from InputSignals[%d]",
-                       buffer.Buffer(), i);
+                       strbuff.Buffer(), i);
           break;
         }
         ok = data.Read("Value", comparators[i].value);