diff --git a/facho/fe/fe.py b/facho/fe/fe.py
index d870f49..98591fb 100644
--- a/facho/fe/fe.py
+++ b/facho/fe/fe.py
@@ -61,7 +61,9 @@ class DianXMLExtensionCUFE(FachoXMLExtension):
 
     def build(self, fachoxml):
         cufe = self._generate_cufe(self.invoice, fachoxml)
-        fachoxml.set_element('/fe:Invoice/cbc:UUID', cufe, schemeName='CUFE-SHA384')
+        fachoxml.set_element('/fe:Invoice/cbc:UUID', cufe,
+                             schemeID=self.tipo_ambiente,
+                             schemeName='CUFE-SHA384')
         fachoxml.set_element('/fe:Invoice/cbc:ProfileID', 'DIAN 2.1')
         fachoxml.set_element('/fe:Invoice/cbc:ProfileExecutionID', self._tipo_ambiente())
         
@@ -133,7 +135,7 @@ class DianXMLExtensionSoftwareProvider(FachoXMLExtension):
         provider_id_attrs.update({'schemeID': self.nit.dv})
         software_provider.set_element('/sts:SoftwareProvider/sts:ProviderID', self.nit,
                                       **provider_id_attrs)
-        software_provider.set_element('/sts:SoftwareProvider/sts:SoftwareID', self.id_software,
+        software_provider.set_element('/sts:SoftwareProvider/sts:softwareID', self.id_software,
                                       **SCHEME_AGENCY_ATTRS)