Index: main/ikobacustom.aaue/trunk/src/ikobacustom/aaue/customers/tests/test_browser.py
===================================================================
--- main/ikobacustom.aaue/trunk/src/ikobacustom/skeleton/customers/tests/test_browser.py	(revision 14309)
+++ main/ikobacustom.aaue/trunk/src/ikobacustom/aaue/customers/tests/test_browser.py	(revision 14310)
@@ -30,13 +30,13 @@
 from waeup.ikoba.customers.tests.test_batching import CustomerImportExportSetup
 from waeup.ikoba.customers.tests.test_browser import CustomersFullSetup
-from ikobacustom.skeleton.customers.export import (
-    SkeletonCustomerExporter,
-    SkeletonCustomerDocumentExporter,
-    SkeletonContractExporter)
-from ikobacustom.skeleton.customers.batching import (
-    SkeletonCustomerProcessor,
-    SkeletonCustomerDocumentProcessor,
-    SkeletonContractProcessor)
-from ikobacustom.skeleton.testing import FunctionalLayer, samples_dir
+from ikobacustom.aaue.customers.export import (
+    AAUECustomerExporter,
+    AAUECustomerDocumentExporter,
+    AAUEContractExporter)
+from ikobacustom.aaue.customers.batching import (
+    AAUECustomerProcessor,
+    AAUECustomerDocumentProcessor,
+    AAUEContractProcessor)
+from ikobacustom.aaue.testing import FunctionalLayer, samples_dir
 
 SAMPLE_IMAGE = os.path.join(os.path.dirname(__file__), 'test_image.jpg')
@@ -61,8 +61,8 @@
         IWorkflowState(customer).setState('started')
         self.app['customers'].addCustomer(customer)
-        document = createObject(u'waeup.SkeletonCustomerDocument')
+        document = createObject(u'waeup.AAUECustomerDocument')
         document.title = u'My first document'
         customer['documents'].addDocument(document)
-        contract = createObject(u'waeup.SkeletonContract')
+        contract = createObject(u'waeup.AAUEContract')
         contract.tc_dict = {'en':u'Hello World'}
         customer['contracts'].addContract(contract)
@@ -77,5 +77,5 @@
         # set values we can expect in export file
         self.setup_for_export()
-        exporter = SkeletonCustomerExporter()
+        exporter = AAUECustomerExporter()
         exporter.export_all(self.app, self.outfile)
         result = open(self.outfile, 'rb').read()
@@ -85,5 +85,5 @@
             'K1000000,aa@aa.aa,Beate,Mueller,,,123,f,0,,,started,[]\r\n')
         # We can reimport the file ...
-        processor = SkeletonCustomerProcessor()
+        processor = AAUECustomerProcessor()
         result = processor.doImport(
             self.outfile,
@@ -118,18 +118,18 @@
         # set values we can expect in export file
         self.setup_for_export()
-        exporter = SkeletonCustomerDocumentExporter()
+        exporter = AAUECustomerDocumentExporter()
         exporter.export_all(self.app, self.outfile)
         result = open(self.outfile, 'rb').read()
         self.assertMatches(result,
             'class_name,document_id,history,state,title,user_id\r\n'
-            'SkeletonCustomerDocument,%s,'
+            'AAUECustomerDocument,%s,'
             '[u\'2014-12-21 17:00:36 WAT - Document created by system\'],'
             'created,My first document,K1000000\r\n'
             % self.document.document_id)
         # We can reimport the file if we change the header (user_id -> customer_id)
-        processor = SkeletonCustomerDocumentProcessor()
+        processor = AAUECustomerDocumentProcessor()
         open(self.outfile, 'wb').write(
             'customer_id,class_name,document_id,state,title\r\n'
-            'K1000000,SkeletonCustomerDocument,%s,started,My first title\r\n'
+            'K1000000,AAUECustomerDocument,%s,started,My first title\r\n'
             % self.document.document_id)
         result = processor.doImport(
@@ -162,5 +162,5 @@
         # set values we can expect in export file
         self.setup_for_export()
-        exporter = SkeletonContractExporter()
+        exporter = AAUEContractExporter()
         exporter.export_all(self.app, self.outfile)
         result = open(self.outfile, 'rb').read()
@@ -169,15 +169,15 @@
             'fee_based,history,last_product_id,product_object,product_options,'
             'state,tc_dict,title,user_id,valid_from,valid_to\r\n'
-            'SkeletonContract,,sample,%s,,0,'
+            'AAUEContract,,sample,%s,,0,'
             '[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 = SkeletonContractProcessor()
+        processor = AAUEContractProcessor()
         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'
-            'SkeletonContract,sample,%s,,'
+            'AAUEContract,sample,%s,,'
             '[u\'2014-12-21 22:26:00 WAT - Contract created by system\']'
             ',,,[],created,{\'en\': u\'Hello World\'},,K1000000\r\n'
@@ -221,6 +221,6 @@
     def setup_customizable_params(self):
         self._contract_category = u'sample'
-        self._document_factory = 'waeup.SkeletonCustomerDocument'
-        self._contract_factory = 'waeup.SkeletonContract'
+        self._document_factory = 'waeup.AAUECustomerDocument'
+        self._contract_factory = 'waeup.AAUEContract'
         return
 
@@ -304,6 +304,6 @@
     def setup_customizable_params(self):
         self._contract_category = u'sample'
-        self._document_factory = 'waeup.SkeletonCustomerDocument'
-        self._contract_factory = 'waeup.SkeletonContract'
+        self._document_factory = 'waeup.AAUECustomerDocument'
+        self._contract_factory = 'waeup.AAUEContract'
         return
 
Index: main/ikobacustom.aaue/trunk/src/ikobacustom/aaue/customers/tests/test_contract.py
===================================================================
--- main/ikobacustom.aaue/trunk/src/ikobacustom/skeleton/customers/tests/test_contract.py	(revision 14309)
+++ main/ikobacustom.aaue/trunk/src/ikobacustom/aaue/customers/tests/test_contract.py	(revision 14310)
@@ -28,7 +28,7 @@
 from waeup.ikoba.customers.contracts import ContractsContainer
 
-from ikobacustom.skeleton.testing import (FunctionalLayer, FunctionalTestCase)
-from ikobacustom.skeleton.customers.contracts import SkeletonContract
-from ikobacustom.skeleton.customers.interfaces import ISkeletonContract
+from ikobacustom.aaue.testing import (FunctionalLayer, FunctionalTestCase)
+from ikobacustom.aaue.customers.contracts import AAUEContract
+from ikobacustom.aaue.customers.interfaces import IAAUEContract
 
 
@@ -38,17 +38,17 @@
 
     def test_interfaces(self):
-        verify.verifyClass(ISkeletonContract, SkeletonContract)
-        verify.verifyClass(ICustomerNavigation, SkeletonContract)
-        verify.verifyObject(ISkeletonContract, SkeletonContract())
-        verify.verifyObject(ICustomerNavigation, SkeletonContract())
+        verify.verifyClass(IAAUEContract, AAUEContract)
+        verify.verifyClass(ICustomerNavigation, AAUEContract)
+        verify.verifyObject(IAAUEContract, AAUEContract())
+        verify.verifyObject(ICustomerNavigation, AAUEContract())
         return
 
     def test_addContract(self):
         container = ContractsContainer()
-        contract = createObject(u'waeup.SkeletonContract')
+        contract = createObject(u'waeup.AAUEContract')
         id = contract.contract_id
         container.addContract(contract)
         self.assertEqual(container[id], contract)
         self.assertRaises(TypeError, container.addContract, object())
-        self.assertEqual(contract.class_name, 'SkeletonContract')
+        self.assertEqual(contract.class_name, 'AAUEContract')
         return
Index: main/ikobacustom.aaue/trunk/src/ikobacustom/aaue/customers/tests/test_customer.py
===================================================================
--- main/ikobacustom.aaue/trunk/src/ikobacustom/skeleton/customers/tests/test_customer.py	(revision 14309)
+++ main/ikobacustom.aaue/trunk/src/ikobacustom/aaue/customers/tests/test_customer.py	(revision 14310)
@@ -17,5 +17,5 @@
 ##
 """
-Tests for skeleton customers.
+Tests for aaue customers.
 """
 import tempfile
@@ -30,14 +30,14 @@
 from waeup.ikoba.customers.container import CustomersContainer
 
-from ikobacustom.skeleton.testing import (FunctionalLayer, FunctionalTestCase)
-from ikobacustom.skeleton.customers.customer import SkeletonCustomer
-from ikobacustom.skeleton.customers.interfaces import ISkeletonCustomer
+from ikobacustom.aaue.testing import (FunctionalLayer, FunctionalTestCase)
+from ikobacustom.aaue.customers.customer import AAUECustomer
+from ikobacustom.aaue.customers.interfaces import IAAUECustomer
 
-class SkeletonCustomerTestCase(FunctionalTestCase):
+class AAUECustomerTestCase(FunctionalTestCase):
 
     layer = FunctionalLayer
 
     def setUp(self):
-        super(SkeletonCustomerTestCase, self).setUp()
+        super(AAUECustomerTestCase, self).setUp()
 
         # Prepopulate ZODB
@@ -52,13 +52,13 @@
 
     def test_interfaces(self):
-        verify.verifyClass(ISkeletonCustomer, SkeletonCustomer)
-        verify.verifyClass(ICustomerNavigation, SkeletonCustomer)
-        verify.verifyObject(ISkeletonCustomer, SkeletonCustomer())
-        verify.verifyObject(ICustomerNavigation, SkeletonCustomer())
+        verify.verifyClass(IAAUECustomer, AAUECustomer)
+        verify.verifyClass(ICustomerNavigation, AAUECustomer)
+        verify.verifyObject(IAAUECustomer, AAUECustomer())
+        verify.verifyObject(ICustomerNavigation, AAUECustomer())
         return
 
-    def test_addSkeletonCustomer(self):
+    def test_addAAUECustomer(self):
         customer = createObject(u'waeup.Customer')
-        verify.verifyObject(ISkeletonCustomer, customer)
+        verify.verifyObject(IAAUECustomer, customer)
         self.app['customers'].addCustomer(customer)
         self.assertEqual(customer.customer_id, 'K1000000')
@@ -68,4 +68,4 @@
     def tearDown(self):
         shutil.rmtree(self.dc_root)
-        super(SkeletonCustomerTestCase, self).tearDown()
+        super(AAUECustomerTestCase, self).tearDown()
         return
Index: main/ikobacustom.aaue/trunk/src/ikobacustom/aaue/customers/tests/test_document.py
===================================================================
--- main/ikobacustom.aaue/trunk/src/ikobacustom/skeleton/customers/tests/test_document.py	(revision 14309)
+++ main/ikobacustom.aaue/trunk/src/ikobacustom/aaue/customers/tests/test_document.py	(revision 14310)
@@ -28,7 +28,7 @@
 from waeup.ikoba.customers.documents import CustomerDocumentsContainer
 
-from ikobacustom.skeleton.testing import (FunctionalLayer, FunctionalTestCase)
-from ikobacustom.skeleton.customers.documents import SkeletonCustomerDocument
-from ikobacustom.skeleton.customers.interfaces import ISkeletonCustomerDocument
+from ikobacustom.aaue.testing import (FunctionalLayer, FunctionalTestCase)
+from ikobacustom.aaue.customers.documents import AAUECustomerDocument
+from ikobacustom.aaue.customers.interfaces import IAAUECustomerDocument
 
 
@@ -38,17 +38,17 @@
 
     def test_interfaces(self):
-        verify.verifyClass(ISkeletonCustomerDocument, SkeletonCustomerDocument)
-        verify.verifyClass(ICustomerNavigation, SkeletonCustomerDocument)
-        verify.verifyObject(ISkeletonCustomerDocument, SkeletonCustomerDocument())
-        verify.verifyObject(ICustomerNavigation, SkeletonCustomerDocument())
+        verify.verifyClass(IAAUECustomerDocument, AAUECustomerDocument)
+        verify.verifyClass(ICustomerNavigation, AAUECustomerDocument)
+        verify.verifyObject(IAAUECustomerDocument, AAUECustomerDocument())
+        verify.verifyObject(ICustomerNavigation, AAUECustomerDocument())
         return
 
     def test_addDocument(self):
         container = CustomerDocumentsContainer()
-        document = createObject(u'waeup.SkeletonCustomerDocument')
+        document = createObject(u'waeup.AAUECustomerDocument')
         id = document.document_id
         container.addDocument(document)
         self.assertEqual(container[id], document)
         self.assertRaises(TypeError, container.addDocument, object())
-        self.assertEqual(document.class_name, 'SkeletonCustomerDocument')
+        self.assertEqual(document.class_name, 'AAUECustomerDocument')
         return
