diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl
index 6cfb809..c800639 100644
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -55,7 +55,11 @@
 				"address_type_code" : "${adresstypecode}",
 				"first_name": "${(executionflow.ShipTo.Contact.FirstName!"")?json_string}",
 				"last_name" :"${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
-				"name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
+				<#if executionflow.ShipTo.Actor.Adresse.Name??>
+					"name_or_company_name" : "${(executionflow.ShipTo.Actor.Adresse.Name!"")?json_string}",
+				<#else>
+					"name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string}${(executionflow.ShipTo.Contact.LastName!"")?json_string}"
+				</#if>
 				<#if executionflow.ShipTo.Contact.Emails?? && executionflow.ShipTo.Contact.Emails[0]!="">
 					"mail_address": "${executionflow.ShipTo.Contact.Emails[0]}",
 				</#if>
diff --git a/Table.ftl b/Table.ftl
index 7f2d545..f9bce7b 100644
--- a/Table.ftl
+++ b/Table.ftl
@@ -6,7 +6,7 @@
     "4":"CLAIM_CRITICALITY_BLOCKING"
  }>
 
- <#-- Table Amout -->
+ <#-- Table Amount -->
 <#assign TableAmount = {
     "$": "USD",
     "£":"GBP",