diff --git a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonSerializer.groovy b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonSerializer.groovy
index 8cc6daf..47050a1 100644
--- a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonSerializer.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonSerializer.groovy
@@ -1403,7 +1403,7 @@ class OpenEhrJsonSerializer {
    {
       def out = [:]
 
-      out.terminology_id = this.serializeTerminologyId(o.terminology_id)
+      out.terminology_id = this.serializeTerminologyId(o.terminologyId)
 
       out.code_string = o.codeString
 
diff --git a/src/main/groovy/com/cabolabs/openehr/validation/RmValidator2.groovy b/src/main/groovy/com/cabolabs/openehr/validation/RmValidator2.groovy
index 78362e7..adc8f38 100644
--- a/src/main/groovy/com/cabolabs/openehr/validation/RmValidator2.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/validation/RmValidator2.groovy
@@ -1354,7 +1354,7 @@ class RmValidator2 {
       //       will return null, and null is always different than the value, making the validation to fail, so
       //       the value is validated ONLY if the defining_code validates OK.
       //
-      if (ct.defining_code.terminology_id.value == 'local' && !report.hasErrors())
+      if (ct.defining_code.terminologyId.value == 'local' && !report.hasErrors())
       {
          //def valid_coded_value = o.owner.getTerm(findRootRecursive(o).archetypeId, ct.defining_code.code_string)
          def valid_coded_value = o.ownerArchetypeRoot.getText(ct.defining_code.codeString)