diff --git a/account_bank_statement_import/README.rst b/account_bank_statement_import_base/README.rst
similarity index 91%
rename from account_bank_statement_import/README.rst
rename to account_bank_statement_import_base/README.rst
index e83688f..9080828 100644
--- a/account_bank_statement_import/README.rst
+++ b/account_bank_statement_import_base/README.rst
@@ -4,6 +4,10 @@
 Account Bank Statement Import
 =============================
 
+CAUTION: this module was renamed in the 9.0 branch to avoid conflicts with the
+upstream account_bank_statement_import module added in odoo 9. Exercise caution
+when porting. 
+
 This module add a generic wizard to import Bank Statements. It also extend
 the bank account module to sanitize the account number and extend the search
 method to use this field when searching on account_number.
diff --git a/account_bank_statement_import/__init__.py b/account_bank_statement_import_base/__init__.py
similarity index 100%
rename from account_bank_statement_import/__init__.py
rename to account_bank_statement_import_base/__init__.py
diff --git a/account_bank_statement_import/__openerp__.py b/account_bank_statement_import_base/__openerp__.py
similarity index 76%
rename from account_bank_statement_import/__openerp__.py
rename to account_bank_statement_import_base/__openerp__.py
index 4680715..d3bd609 100644
--- a/account_bank_statement_import/__openerp__.py
+++ b/account_bank_statement_import_base/__openerp__.py
@@ -16,5 +16,8 @@
         'demo/partner_bank.xml',
     ],
     'auto_install': False,
+# CAUTION: this module was renamed in the 9.0 branch to avoid conflicts with the
+# upstream account_bank_statement_import module added in odoo 9. Exercise caution
+# when porting.
     'installable': False,
 }
diff --git a/account_bank_statement_import/demo/fiscalyear_period.xml b/account_bank_statement_import_base/demo/fiscalyear_period.xml
similarity index 100%
rename from account_bank_statement_import/demo/fiscalyear_period.xml
rename to account_bank_statement_import_base/demo/fiscalyear_period.xml
diff --git a/account_bank_statement_import/demo/partner_bank.xml b/account_bank_statement_import_base/demo/partner_bank.xml
similarity index 100%
rename from account_bank_statement_import/demo/partner_bank.xml
rename to account_bank_statement_import_base/demo/partner_bank.xml
diff --git a/account_bank_statement_import/i18n/account_bank_statement_import.pot b/account_bank_statement_import_base/i18n/account_bank_statement_import.pot
similarity index 100%
rename from account_bank_statement_import/i18n/account_bank_statement_import.pot
rename to account_bank_statement_import_base/i18n/account_bank_statement_import.pot
diff --git a/account_bank_statement_import/i18n/en.po b/account_bank_statement_import_base/i18n/en.po
similarity index 100%
rename from account_bank_statement_import/i18n/en.po
rename to account_bank_statement_import_base/i18n/en.po
diff --git a/account_bank_statement_import/i18n/es.po b/account_bank_statement_import_base/i18n/es.po
similarity index 100%
rename from account_bank_statement_import/i18n/es.po
rename to account_bank_statement_import_base/i18n/es.po
diff --git a/account_bank_statement_import/i18n/fr.po b/account_bank_statement_import_base/i18n/fr.po
similarity index 100%
rename from account_bank_statement_import/i18n/fr.po
rename to account_bank_statement_import_base/i18n/fr.po
diff --git a/account_bank_statement_import/i18n/lt.po b/account_bank_statement_import_base/i18n/lt.po
similarity index 100%
rename from account_bank_statement_import/i18n/lt.po
rename to account_bank_statement_import_base/i18n/lt.po
diff --git a/account_bank_statement_import/i18n/lt_LT.po b/account_bank_statement_import_base/i18n/lt_LT.po
similarity index 100%
rename from account_bank_statement_import/i18n/lt_LT.po
rename to account_bank_statement_import_base/i18n/lt_LT.po
diff --git a/account_bank_statement_import/i18n/nl.po b/account_bank_statement_import_base/i18n/nl.po
similarity index 100%
rename from account_bank_statement_import/i18n/nl.po
rename to account_bank_statement_import_base/i18n/nl.po
diff --git a/account_bank_statement_import/i18n/pt_BR.po b/account_bank_statement_import_base/i18n/pt_BR.po
similarity index 100%
rename from account_bank_statement_import/i18n/pt_BR.po
rename to account_bank_statement_import_base/i18n/pt_BR.po
diff --git a/account_bank_statement_import/i18n/sl.po b/account_bank_statement_import_base/i18n/sl.po
similarity index 100%
rename from account_bank_statement_import/i18n/sl.po
rename to account_bank_statement_import_base/i18n/sl.po
diff --git a/account_bank_statement_import/migrations/8.0.1.0/post-migrate.py b/account_bank_statement_import_base/migrations/8.0.1.0/post-migrate.py
similarity index 100%
rename from account_bank_statement_import/migrations/8.0.1.0/post-migrate.py
rename to account_bank_statement_import_base/migrations/8.0.1.0/post-migrate.py
diff --git a/account_bank_statement_import/models/__init__.py b/account_bank_statement_import_base/models/__init__.py
similarity index 100%
rename from account_bank_statement_import/models/__init__.py
rename to account_bank_statement_import_base/models/__init__.py
diff --git a/account_bank_statement_import/models/account_bank_statement_import.py b/account_bank_statement_import_base/models/account_bank_statement_import.py
similarity index 100%
rename from account_bank_statement_import/models/account_bank_statement_import.py
rename to account_bank_statement_import_base/models/account_bank_statement_import.py
diff --git a/account_bank_statement_import/models/account_config_settings.py b/account_bank_statement_import_base/models/account_config_settings.py
similarity index 100%
rename from account_bank_statement_import/models/account_config_settings.py
rename to account_bank_statement_import_base/models/account_config_settings.py
diff --git a/account_bank_statement_import/models/res_partner_bank.py b/account_bank_statement_import_base/models/res_partner_bank.py
similarity index 100%
rename from account_bank_statement_import/models/res_partner_bank.py
rename to account_bank_statement_import_base/models/res_partner_bank.py
diff --git a/account_bank_statement_import/parserlib.py b/account_bank_statement_import_base/parserlib.py
similarity index 100%
rename from account_bank_statement_import/parserlib.py
rename to account_bank_statement_import_base/parserlib.py
diff --git a/account_bank_statement_import/static/description/icon.png b/account_bank_statement_import_base/static/description/icon.png
similarity index 100%
rename from account_bank_statement_import/static/description/icon.png
rename to account_bank_statement_import_base/static/description/icon.png
diff --git a/account_bank_statement_import/static/description/icon_src.svg b/account_bank_statement_import_base/static/description/icon_src.svg
similarity index 100%
rename from account_bank_statement_import/static/description/icon_src.svg
rename to account_bank_statement_import_base/static/description/icon_src.svg
diff --git a/account_bank_statement_import/tests/__init__.py b/account_bank_statement_import_base/tests/__init__.py
similarity index 100%
rename from account_bank_statement_import/tests/__init__.py
rename to account_bank_statement_import_base/tests/__init__.py
diff --git a/account_bank_statement_import/tests/test_import_bank_statement.py b/account_bank_statement_import_base/tests/test_import_bank_statement.py
similarity index 100%
rename from account_bank_statement_import/tests/test_import_bank_statement.py
rename to account_bank_statement_import_base/tests/test_import_bank_statement.py
diff --git a/account_bank_statement_import/tests/test_import_file.py b/account_bank_statement_import_base/tests/test_import_file.py
similarity index 100%
rename from account_bank_statement_import/tests/test_import_file.py
rename to account_bank_statement_import_base/tests/test_import_file.py
diff --git a/account_bank_statement_import/tests/test_res_partner_bank.py b/account_bank_statement_import_base/tests/test_res_partner_bank.py
similarity index 100%
rename from account_bank_statement_import/tests/test_res_partner_bank.py
rename to account_bank_statement_import_base/tests/test_res_partner_bank.py
diff --git a/account_bank_statement_import/views/account_bank_statement_import_view.xml b/account_bank_statement_import_base/views/account_bank_statement_import_view.xml
similarity index 100%
rename from account_bank_statement_import/views/account_bank_statement_import_view.xml
rename to account_bank_statement_import_base/views/account_bank_statement_import_view.xml
diff --git a/account_bank_statement_import/views/account_config_settings.xml b/account_bank_statement_import_base/views/account_config_settings.xml
similarity index 100%
rename from account_bank_statement_import/views/account_config_settings.xml
rename to account_bank_statement_import_base/views/account_config_settings.xml