diff --git a/www/services/credit-data/v1/index.php b/www/services/credit-data/v1/index.php
index 89d523fdf..f5f676ba8 100644
--- a/www/services/credit-data/v1/index.php
+++ b/www/services/credit-data/v1/index.php
@@ -19,7 +19,7 @@ if (NDEBUG) {
     $gServiceHeader = readSoapHeader();
 }
 $gDataSetTypes   = array('Full', 'Compact', 'CreditRecommendation', 'Flex');
-$gLanguageCodes  = array('EN', 'FR');
+$gLanguageCodes  = array('en', 'fr');
 $gServiceLevels  = array('Normal', 'Urgent', 'Flash');
 $gLevelDurations = array('Normal' => 7, 'Urgent' => 5, 'Flash' => 3);
 $gTestCompanies  = array('55214450300018',
@@ -368,7 +368,7 @@ function company(&$i)
     $country_legal_form               = new StdClass;
     $country_legal_form->_            = $i['FJ_lib'];
     $country_legal_form->code         = $i['FJ'];
-    $country_legal_form->lang         = 'FR';
+    $country_legal_form->lang         = 'fr';
     $c->LegalForm                     = new StdClass;
     $c->LegalForm->CountryLegalForm   = $country_legal_form;
     $c->LegalForm->UnifiedLegalForm   = 'Unknown';  // TODO
@@ -403,11 +403,11 @@ function company(&$i)
     $product_name->_                  = $i['NafEtabLib'];
   //$product_name->source             = ;
   //$product_name->isPrimary          = ;
-    $product_name->lang               = 'FR';
+    $product_name->lang               = 'fr';
     $op->ProductName[]                = $product_name;
     $product_name                     = new StdClass;
     $product_name->_                  = $i['Activite'];
-    $product_name->lang               = 'FR';
+    $product_name->lang               = 'fr';
     $op->ProductName[]                = $product_name;
     $op->IndustryCode                 = new StdClass;
     $op->IndustryCode->NaceCode       = substr($i['NaceEtab'], 1);
@@ -455,7 +455,7 @@ function bilans(&$ratios)
             $description       = new StdClass;
             $description->_    = $ratios['ratiosInfos']['r'.$code]['libelle'];
             $description->code = 'r'.$code;
-            $description->lang = 'FR';
+            $description->lang = 'fr';
             $item              = new NumberAccountItem;
             $item->Description = $description;
           //$item->level       = ;
@@ -470,7 +470,7 @@ function bilans(&$ratios)
             $description       = new StdClass;
             $description->_    = $ratios['ratiosInfos']['r'.$code]['libelle'];
             $description->code = 'r'.$code;
-            $description->lang = 'FR';
+            $description->lang = 'fr';
             $item              = new NumberAccountItem;
             $item->Description = $description;
           //$item->level       = ;
@@ -494,7 +494,7 @@ function bilans(&$ratios)
             $description       = new StdClass;
             $description->_    = $ratios['ratiosInfos'][$code]['libelle'];
             $description->code = $code;
-            $description->lang = 'FR';
+            $description->lang = 'fr';
             $item              = new NumberAccountItem;
             $item->Description = $description;
           //$item->level = ;
@@ -694,7 +694,7 @@ function dirigeants(&$i)
         $pos->PositionTitle            = new StdClass;
         $pos->PositionTitle->_         = $i['dir1Titre'];
       //$pos->PositionTitle->code      = ;
-        $pos->PositionTitle->lang      = 'FR';
+        $pos->PositionTitle->lang      = 'fr';
         $pos->Type                     = 'Management';
       //$pos->OtherPositions           = ;
       //$pos->OtherDirectorShips       = ;
@@ -725,7 +725,7 @@ function dirigeants(&$i)
         }
         $pos->PositionTitle            = new StdClass;
         $pos->PositionTitle->_         = $i['dir2Titre'];
-        $pos->PositionTitle->lang      = 'FR';
+        $pos->PositionTitle->lang      = 'fr';
         $pos->Type                     = 'Management';
         $pos->Person                   = new StdClass;
         $pos->Person->DateOfBirth      = $i['dir2DateNaiss'];
diff --git a/www/services/monitors.sql b/www/services/monitors.sql
index 71085f257..8098810a4 100644
--- a/www/services/monitors.sql
+++ b/www/services/monitors.sql
@@ -33,7 +33,7 @@ CREATE TABLE IF NOT EXISTS `monitors` (
   `CompanyName` tinytext COLLATE utf8_unicode_ci NOT NULL,
   `CategoryName` enum('All','CreditRecommendation') COLLATE utf8_unicode_ci NOT NULL,
   `EventType` enum('EventOnly','EventWithData') COLLATE utf8_unicode_ci NOT NULL,
-  `LanguageCode` enum('EN','FR') COLLATE utf8_unicode_ci NOT NULL,
+  `LanguageCode` enum('en','fr') COLLATE utf8_unicode_ci NOT NULL,
   `ActualStartDate` date NOT NULL,
   `ActualEndDate` date NOT NULL,
   PRIMARY KEY (`ProviderOrderId`)
diff --git a/www/services/orders.sql b/www/services/orders.sql
index 61910d231..cfb0938f8 100644
--- a/www/services/orders.sql
+++ b/www/services/orders.sql
@@ -33,7 +33,7 @@ CREATE TABLE IF NOT EXISTS `orders` (
   `OrderType` enum('DataSet','Monitoring','Investigation') COLLATE utf8_unicode_ci NOT NULL,
   `DataSetType` enum('Full','Compact','CreditRecommendation','Flex') COLLATE utf8_unicode_ci NOT NULL,
   `ServiceLevelName` enum('Immediate','Normal','Urgent','Flash') COLLATE utf8_unicode_ci NOT NULL,
-  `LanguageCode` enum('EN','FR') COLLATE utf8_unicode_ci NOT NULL,
+  `LanguageCode` enum('en','fr') COLLATE utf8_unicode_ci NOT NULL,
   `OrderStatus` enum('Completed','Pending','Delivered','Undeliverable') COLLATE utf8_unicode_ci NOT NULL,
   `OrderDateTime` datetime NOT NULL,
   `DateTimeCompleted` datetime NOT NULL,
diff --git a/www/services/test-credit-data.php b/www/services/test-credit-data.php
index 0624f0bdc..5709cb626 100644
--- a/www/services/test-credit-data.php
+++ b/www/services/test-credit-data.php
@@ -71,7 +71,7 @@ case 'OrderDataSet':
     $o->DataSetType          = new StdClass;
     $o->DataSetType->_       = 'Full';
     $o->DataSetVersion       = VERSION;
-    $o->LanguageCode         = 'FR';
+    $o->LanguageCode         = 'fr';
     $fonction                = 'OrderDataSet';
     break;
 case 'RetrieveOrderStatus':
@@ -88,7 +88,7 @@ case 'StartInvestigation':
     $o->DataSetType->_       = 'Full';
     $o->DataSetVersion       = VERSION;
     $o->ServiceLevelName     = 'Normal';
-    $o->LanguageCode         = 'FR';
+    $o->LanguageCode         = 'fr';
     $fonction                = 'StartInvestigation';
     break;
 case 'StartMonitoring':
@@ -96,7 +96,7 @@ case 'StartMonitoring':
     $o->CategoryName         = 'All';
     $o->EventType            = 'EventOnly';
     $o->MonitoringVersion    = '1.0';
-    $o->LanguageCode         = 'FR';
+    $o->LanguageCode         = 'fr';
   //$o->PreferredStartDate   = ;
   //$o->PreferredEndDate     = ;
     $fonction                = 'StartMonitoring';