diff --git a/__init__.py b/__init__.py
index e67931da7d..f7186f22a2 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,27 +1,29 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
 from trytond.pool import Pool
-from .payment import *
-from .account import *
+from . import payment
+from . import account
 from . import party
 
 
 def register():
     Pool.register(
-        Journal,
-        Group,
-        Payment,
-        MoveLine,
-        ProcessPaymentStart,
-        PayLineAskJournal,
-        Configuration,
-        ConfigurationPaymentGroupSequence,
-        Invoice,
+        payment.Journal,
+        payment.Group,
+        payment.Payment,
+        account.MoveLine,
+        payment.ProcessPaymentStart,
+        account.PayLineAskJournal,
+        account.Configuration,
+        account.ConfigurationPaymentGroupSequence,
         party.Party,
         party.PartyPaymentDirectDebit,
         module='account_payment', type_='model')
     Pool.register(
-        ProcessPayment,
-        PayLine,
+        account.Invoice,
+        module='account_payment', type_='model', depends=['account_invoice'])
+    Pool.register(
+        payment.ProcessPayment,
+        account.PayLine,
         party.PartyReplace,
         module='account_payment', type_='wizard')