Index: main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/tests/test_browser.py
===================================================================
--- main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/tests/test_browser.py	(revision 12460)
+++ main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/tests/test_browser.py	(revision 12484)
@@ -34,10 +34,10 @@
     PCNCustomerPDFDocumentExporter,
     PCNCustomerJPGDocumentExporter,
-    PCNLicenseContractExporter)
+    RONContractExporter)
 from ikobacustom.pcn.customers.batching import (
     PCNCustomerProcessor,
     PCNCustomerPDFDocumentProcessor,
     PCNCustomerJPGDocumentProcessor,
-    PCNLicenseContractProcessor)
+    RONContractProcessor)
 from ikobacustom.pcn.testing import FunctionalLayer, samples_dir
 
@@ -68,5 +68,5 @@
         customer['documents'].addDocument(document1)
         customer['documents'].addDocument(document2)
-        contract = createObject(u'waeup.PCNLicenseContract')
+        contract = createObject(u'waeup.RONContract')
         contract.tc_dict = {'en':u'Hello World'}
         customer['contracts'].addContract(contract)
@@ -210,5 +210,5 @@
         # set values we can expect in export file
         self.setup_for_export()
-        exporter = PCNLicenseContractExporter()
+        exporter = RONContractExporter()
         exporter.export_all(self.app, self.outfile)
         result = open(self.outfile, 'rb').read()
@@ -217,15 +217,15 @@
             'history,last_product_id,product_object,product_options,'
             'state,tc_dict,title,user_id\r\n'
-            'PCNLicenseContract,license,%s,,'
+            'RONContract,license,%s,,'
             '[u\'2014-12-21 22:26:00 WAT - Contract created by system\']'
             ',,,[],created,{\'en\': u\'Hello World\'},,K1000000\r\n'
             % self.contract.contract_id)
         # We can reimport the file if we change the header (user_id -> customer_id)
-        processor = PCNLicenseContractProcessor()
+        processor = RONContractProcessor()
         open(self.outfile, 'wb').write(
             'class_name,contract_category,contract_id,document_object,'
             'history,last_product_id,product_object,product_options,'
             'state,tc_dict,title,user_id\r\n'
-            'PCNLicenseContract,license,%s,,'
+            'RONContract,license,%s,,'
             '[u\'2014-12-21 22:26:00 WAT - Contract created by system\']'
             ',,,[],created,{\'en\': u\'Hello World\'},,K1000000\r\n'
@@ -270,5 +270,5 @@
         self._contract_category = u'license'
         self._document_factory = 'waeup.PCNCustomerPDFDocument'
-        self._contract_factory = 'waeup.PCNLicenseContract'
+        self._contract_factory = 'waeup.RONContract'
         return
 
@@ -326,5 +326,5 @@
         self._contract_category = u'license'
         self._document_factory = 'waeup.PCNCustomerPDFDocument'
-        self._contract_factory = 'waeup.PCNLicenseContract'
+        self._contract_factory = 'waeup.RONContract'
         return
 
Index: main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/tests/test_contract.py
===================================================================
--- main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/tests/test_contract.py	(revision 12460)
+++ main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/tests/test_contract.py	(revision 12484)
@@ -29,6 +29,6 @@
 
 from ikobacustom.pcn.testing import (FunctionalLayer, FunctionalTestCase)
-from ikobacustom.pcn.customers.contracts import PCNLicenseContract
-from ikobacustom.pcn.customers.interfaces import IPCNLicenseContract
+from ikobacustom.pcn.customers.contracts import RONContract
+from ikobacustom.pcn.customers.interfaces import IRONContract
 
 
@@ -38,17 +38,17 @@
 
     def test_interfaces(self):
-        verify.verifyClass(IPCNLicenseContract, PCNLicenseContract)
-        verify.verifyClass(ICustomerNavigation, PCNLicenseContract)
-        verify.verifyObject(IPCNLicenseContract, PCNLicenseContract())
-        verify.verifyObject(ICustomerNavigation, PCNLicenseContract())
+        verify.verifyClass(IRONContract, RONContract)
+        verify.verifyClass(ICustomerNavigation, RONContract)
+        verify.verifyObject(IRONContract, RONContract())
+        verify.verifyObject(ICustomerNavigation, RONContract())
         return
 
     def test_addContract(self):
         container = ContractsContainer()
-        contract = createObject(u'waeup.PCNLicenseContract')
+        contract = createObject(u'waeup.RONContract')
         id = contract.contract_id
         container.addContract(contract)
         self.assertEqual(container[id], contract)
         self.assertRaises(TypeError, container.addContract, object())
-        self.assertEqual(contract.class_name, 'PCNLicenseContract')
+        self.assertEqual(contract.class_name, 'RONContract')
         return
