diff --git a/modules/edocument_uncefact/template/16B-CII/CrossIndustryInvoice.xml b/modules/edocument_uncefact/template/16B-CII/CrossIndustryInvoice.xml
index 8e009ba9c7..5ca38b5433 100644
--- a/modules/edocument_uncefact/template/16B-CII/CrossIndustryInvoice.xml
+++ b/modules/edocument_uncefact/template/16B-CII/CrossIndustryInvoice.xml
@@ -25,19 +25,21 @@ this repository contains the full copyright notices and license terms. -->
     </py:def>
     <py:def function="TradeAddress(address)">
         <ram:PostcodeCode py:if="address.postal_code">${address.postal_code}</ram:PostcodeCode>
-        <ram:BuildingName py:if="address.name">${address.name}</ram:BuildingName>
-        <py:with vars="lines = (address.street or '').splitlines()">
+        <ram:BuildingName py:if="address.building_name">${address.building_name}</ram:BuildingName>
+        <py:with vars="lines = (address.street_unstructured or '').splitlines()">
             <ram:LineOne py:if="len(lines) > 0">${lines[0]}</ram:LineOne>
             <ram:LineTwo py:if="len(lines) > 1">${lines[1]}</ram:LineTwo>
             <ram:LineThree  py:if="len(lines) > 2">${lines[2]}</ram:LineThree>
             <ram:LineFour py:if="len(lines) > 3">${lines[3]}</ram:LineFour>
             <ram:LineFive py:if="len(lines) > 4">${lines[4]}</ram:LineFive>
         </py:with>
+        <ram:StreetName py:if="address.street_name">${address.street_name}</ram:StreetName>
         <ram:CityName py:if="address.city">${address.city}</ram:CityName>
         <ram:CountryID py:if="address.country">${address.country.code}</ram:CountryID>
         <ram:CountryName py:if="address.country">${address.country.name}</ram:CountryName>
         <ram:CountrySubDivisionID py:if="address.subdivision">${address.subdivision.code}</ram:CountrySubDivisionID>
         <ram:CountrySubDivisionName py:if="address.subdivision">${address.subdivision.name}</ram:CountrySubDivisionName>
+        <ram:BuildingNumber py:if="address.building_number">${address.building_number}</ram:BuildingNumber>
     </py:def>
     <py:def function="TradeTax(tax, amount=None, base=None)">
         <ram:ApplicableTradeTax>
diff --git a/modules/edocument_uncefact/tests/test_module.py b/modules/edocument_uncefact/tests/test_module.py
index abeef73fce..583698e496 100644
--- a/modules/edocument_uncefact/tests/test_module.py
+++ b/modules/edocument_uncefact/tests/test_module.py
@@ -30,21 +30,21 @@ def get_invoice():
     Uom = pool.get('product.uom')
 
     address = Mock(spec=Address,
-        street="St sample, 15",
+        street_unstructured="St sample, 15",
         city="Scranton",
         postal_code="1000",
         subdivision=None,
         country=Mock(spec=Country,
             code='US'),
         )
-    address.name = "Building A"
+    address.building_name = "Building A"
     address.country.name = "United States"
     party = Mock(spec=Party, addresses=[address])
     party.name = "Michael Scott"
     company = Mock(spec=Company,
         party=Mock(spec=Party,
         addresses=[Mock(spec=Address,
-                    street="Main street, 42",
+                    street_unstructured="Main street, 42",
                     country=Mock(spec=Country,
                         code='US'))]))
     company.party.name = "Dunder Mifflin"