diff --git a/addons/association/__terp__.py b/addons/association/__openerp__.py
similarity index 100%
rename from addons/association/__terp__.py
rename to addons/association/__openerp__.py
diff --git a/addons/auction/__terp__.py b/addons/auction/__openerp__.py
similarity index 100%
rename from addons/auction/__terp__.py
rename to addons/auction/__openerp__.py
diff --git a/addons/audittrail/__terp__.py b/addons/audittrail/__openerp__.py
similarity index 100%
rename from addons/audittrail/__terp__.py
rename to addons/audittrail/__openerp__.py
diff --git a/addons/base_action_rule/__terp__.py b/addons/base_action_rule/__openerp__.py
similarity index 100%
rename from addons/base_action_rule/__terp__.py
rename to addons/base_action_rule/__openerp__.py
diff --git a/addons/base_calendar/__terp__.py b/addons/base_calendar/__openerp__.py
similarity index 100%
rename from addons/base_calendar/__terp__.py
rename to addons/base_calendar/__openerp__.py
diff --git a/addons/base_contact/__terp__.py b/addons/base_contact/__openerp__.py
similarity index 100%
rename from addons/base_contact/__terp__.py
rename to addons/base_contact/__openerp__.py
diff --git a/addons/base_iban/__terp__.py b/addons/base_iban/__openerp__.py
similarity index 100%
rename from addons/base_iban/__terp__.py
rename to addons/base_iban/__openerp__.py
diff --git a/addons/base_module_quality/__terp__.py b/addons/base_module_quality/__openerp__.py
similarity index 100%
rename from addons/base_module_quality/__terp__.py
rename to addons/base_module_quality/__openerp__.py
diff --git a/addons/base_module_record/__terp__.py b/addons/base_module_record/__openerp__.py
similarity index 100%
rename from addons/base_module_record/__terp__.py
rename to addons/base_module_record/__openerp__.py
diff --git a/addons/base_report_creator/__terp__.py b/addons/base_report_creator/__openerp__.py
similarity index 100%
rename from addons/base_report_creator/__terp__.py
rename to addons/base_report_creator/__openerp__.py
diff --git a/addons/base_report_designer/__terp__.py b/addons/base_report_designer/__openerp__.py
similarity index 100%
rename from addons/base_report_designer/__terp__.py
rename to addons/base_report_designer/__openerp__.py
diff --git a/addons/base_setup/__terp__.py b/addons/base_setup/__openerp__.py
similarity index 100%
rename from addons/base_setup/__terp__.py
rename to addons/base_setup/__openerp__.py
diff --git a/addons/base_vat/__terp__.py b/addons/base_vat/__openerp__.py
similarity index 100%
rename from addons/base_vat/__terp__.py
rename to addons/base_vat/__openerp__.py
diff --git a/addons/board/__terp__.py b/addons/board/__openerp__.py
similarity index 100%
rename from addons/board/__terp__.py
rename to addons/board/__openerp__.py
diff --git a/addons/board_account/__terp__.py b/addons/board_account/__openerp__.py
similarity index 100%
rename from addons/board_account/__terp__.py
rename to addons/board_account/__openerp__.py
diff --git a/addons/board_association/__terp__.py b/addons/board_association/__openerp__.py
similarity index 100%
rename from addons/board_association/__terp__.py
rename to addons/board_association/__openerp__.py
diff --git a/addons/board_auction/__terp__.py b/addons/board_auction/__openerp__.py
similarity index 100%
rename from addons/board_auction/__terp__.py
rename to addons/board_auction/__openerp__.py
diff --git a/addons/board_crm_configuration/__terp__.py b/addons/board_crm_configuration/__openerp__.py
similarity index 100%
rename from addons/board_crm_configuration/__terp__.py
rename to addons/board_crm_configuration/__openerp__.py
diff --git a/addons/board_document/__terp__.py b/addons/board_document/__openerp__.py
similarity index 100%
rename from addons/board_document/__terp__.py
rename to addons/board_document/__openerp__.py
diff --git a/addons/board_hr/__terp__.py b/addons/board_hr/__openerp__.py
similarity index 100%
rename from addons/board_hr/__terp__.py
rename to addons/board_hr/__openerp__.py
diff --git a/addons/board_manufacturing/__terp__.py b/addons/board_manufacturing/__openerp__.py
similarity index 100%
rename from addons/board_manufacturing/__terp__.py
rename to addons/board_manufacturing/__openerp__.py
diff --git a/addons/board_project/__terp__.py b/addons/board_project/__openerp__.py
similarity index 100%
rename from addons/board_project/__terp__.py
rename to addons/board_project/__openerp__.py
diff --git a/addons/board_sale/__terp__.py b/addons/board_sale/__openerp__.py
similarity index 100%
rename from addons/board_sale/__terp__.py
rename to addons/board_sale/__openerp__.py
diff --git a/addons/board_warehouse/__terp__.py b/addons/board_warehouse/__openerp__.py
similarity index 100%
rename from addons/board_warehouse/__terp__.py
rename to addons/board_warehouse/__openerp__.py
diff --git a/addons/caldav/__terp__.py b/addons/caldav/__openerp__.py
similarity index 100%
rename from addons/caldav/__terp__.py
rename to addons/caldav/__openerp__.py
diff --git a/addons/crm/__terp__.py b/addons/crm/__openerp__.py
similarity index 100%
rename from addons/crm/__terp__.py
rename to addons/crm/__openerp__.py
diff --git a/addons/crm_caldav/__terp__.py b/addons/crm_caldav/__openerp__.py
similarity index 100%
rename from addons/crm_caldav/__terp__.py
rename to addons/crm_caldav/__openerp__.py
diff --git a/addons/crm_profiling/__terp__.py b/addons/crm_profiling/__openerp__.py
similarity index 100%
rename from addons/crm_profiling/__terp__.py
rename to addons/crm_profiling/__openerp__.py
diff --git a/addons/decimal_precision/__terp__.py b/addons/decimal_precision/__openerp__.py
similarity index 100%
rename from addons/decimal_precision/__terp__.py
rename to addons/decimal_precision/__openerp__.py
diff --git a/addons/delivery/__terp__.py b/addons/delivery/__openerp__.py
similarity index 100%
rename from addons/delivery/__terp__.py
rename to addons/delivery/__openerp__.py
diff --git a/addons/document/__terp__.py b/addons/document/__openerp__.py
similarity index 100%
rename from addons/document/__terp__.py
rename to addons/document/__openerp__.py
diff --git a/addons/document_ftp/__terp__.py b/addons/document_ftp/__openerp__.py
similarity index 100%
rename from addons/document_ftp/__terp__.py
rename to addons/document_ftp/__openerp__.py
diff --git a/addons/document_ics/__terp__.py b/addons/document_ics/__openerp__.py
similarity index 100%
rename from addons/document_ics/__terp__.py
rename to addons/document_ics/__openerp__.py
diff --git a/addons/document_webdav/__terp__.py b/addons/document_webdav/__openerp__.py
similarity index 100%
rename from addons/document_webdav/__terp__.py
rename to addons/document_webdav/__openerp__.py
diff --git a/addons/fetchmail/__terp__.py b/addons/fetchmail/__openerp__.py
similarity index 100%
rename from addons/fetchmail/__terp__.py
rename to addons/fetchmail/__openerp__.py
diff --git a/addons/google_map/__terp__.py b/addons/google_map/__openerp__.py
similarity index 100%
rename from addons/google_map/__terp__.py
rename to addons/google_map/__openerp__.py
diff --git a/addons/html_view/__terp__.py b/addons/html_view/__openerp__.py
similarity index 100%
rename from addons/html_view/__terp__.py
rename to addons/html_view/__openerp__.py
diff --git a/addons/idea/__terp__.py b/addons/idea/__openerp__.py
similarity index 100%
rename from addons/idea/__terp__.py
rename to addons/idea/__openerp__.py
diff --git a/addons/knowledge/__terp__.py b/addons/knowledge/__openerp__.py
similarity index 100%
rename from addons/knowledge/__terp__.py
rename to addons/knowledge/__openerp__.py
diff --git a/addons/l10n_be/__terp__.py b/addons/l10n_be/__openerp__.py
similarity index 100%
rename from addons/l10n_be/__terp__.py
rename to addons/l10n_be/__openerp__.py
diff --git a/addons/l10n_ch/__terp__.py b/addons/l10n_ch/__openerp__.py
similarity index 100%
rename from addons/l10n_ch/__terp__.py
rename to addons/l10n_ch/__openerp__.py
diff --git a/addons/l10n_ch_chart_c2c_pcg/__terp__.py b/addons/l10n_ch_chart_c2c_pcg/__openerp__.py
similarity index 100%
rename from addons/l10n_ch_chart_c2c_pcg/__terp__.py
rename to addons/l10n_ch_chart_c2c_pcg/__openerp__.py
diff --git a/addons/l10n_chart_uk_minimal/__terp__.py b/addons/l10n_chart_uk_minimal/__openerp__.py
similarity index 100%
rename from addons/l10n_chart_uk_minimal/__terp__.py
rename to addons/l10n_chart_uk_minimal/__openerp__.py
diff --git a/addons/l10n_fr/__terp__.py b/addons/l10n_fr/__openerp__.py
similarity index 100%
rename from addons/l10n_fr/__terp__.py
rename to addons/l10n_fr/__openerp__.py
diff --git a/addons/l10n_lu/__terp__.py b/addons/l10n_lu/__openerp__.py
similarity index 100%
rename from addons/l10n_lu/__terp__.py
rename to addons/l10n_lu/__openerp__.py
diff --git a/addons/lunch/__terp__.py b/addons/lunch/__openerp__.py
similarity index 100%
rename from addons/lunch/__terp__.py
rename to addons/lunch/__openerp__.py
diff --git a/addons/mail_gateway/__terp__.py b/addons/mail_gateway/__openerp__.py
similarity index 100%
rename from addons/mail_gateway/__terp__.py
rename to addons/mail_gateway/__openerp__.py
diff --git a/addons/mrp/__terp__.py b/addons/mrp/__openerp__.py
similarity index 100%
rename from addons/mrp/__terp__.py
rename to addons/mrp/__openerp__.py
diff --git a/addons/mrp_jit/__terp__.py b/addons/mrp_jit/__openerp__.py
similarity index 100%
rename from addons/mrp_jit/__terp__.py
rename to addons/mrp_jit/__openerp__.py
diff --git a/addons/mrp_operations/__terp__.py b/addons/mrp_operations/__openerp__.py
similarity index 100%
rename from addons/mrp_operations/__terp__.py
rename to addons/mrp_operations/__openerp__.py
diff --git a/addons/mrp_repair/__terp__.py b/addons/mrp_repair/__openerp__.py
similarity index 100%
rename from addons/mrp_repair/__terp__.py
rename to addons/mrp_repair/__openerp__.py
diff --git a/addons/mrp_subproduct/__terp__.py b/addons/mrp_subproduct/__openerp__.py
similarity index 100%
rename from addons/mrp_subproduct/__terp__.py
rename to addons/mrp_subproduct/__openerp__.py
diff --git a/addons/multi_company/__terp__.py b/addons/multi_company/__openerp__.py
similarity index 100%
rename from addons/multi_company/__terp__.py
rename to addons/multi_company/__openerp__.py
diff --git a/addons/olap/__terp__.py b/addons/olap/__openerp__.py
similarity index 100%
rename from addons/olap/__terp__.py
rename to addons/olap/__openerp__.py
diff --git a/addons/olap_crm/__terp__.py b/addons/olap_crm/__openerp__.py
similarity index 100%
rename from addons/olap_crm/__terp__.py
rename to addons/olap_crm/__openerp__.py
diff --git a/addons/olap_extract/__terp__.py b/addons/olap_extract/__openerp__.py
similarity index 100%
rename from addons/olap_extract/__terp__.py
rename to addons/olap_extract/__openerp__.py
diff --git a/addons/olap_sale/__terp__.py b/addons/olap_sale/__openerp__.py
similarity index 100%
rename from addons/olap_sale/__terp__.py
rename to addons/olap_sale/__openerp__.py
diff --git a/addons/partner_crm/__terp__.py b/addons/partner_crm/__openerp__.py
similarity index 100%
rename from addons/partner_crm/__terp__.py
rename to addons/partner_crm/__openerp__.py
diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__openerp__.py
similarity index 100%
rename from addons/point_of_sale/__terp__.py
rename to addons/point_of_sale/__openerp__.py
diff --git a/addons/process/__terp__.py b/addons/process/__openerp__.py
similarity index 100%
rename from addons/process/__terp__.py
rename to addons/process/__openerp__.py
diff --git a/addons/product/__terp__.py b/addons/product/__openerp__.py
similarity index 100%
rename from addons/product/__terp__.py
rename to addons/product/__openerp__.py
diff --git a/addons/product_margin/__terp__.py b/addons/product_margin/__openerp__.py
similarity index 100%
rename from addons/product_margin/__terp__.py
rename to addons/product_margin/__openerp__.py
diff --git a/addons/profile_accounting/__terp__.py b/addons/profile_accounting/__openerp__.py
similarity index 100%
rename from addons/profile_accounting/__terp__.py
rename to addons/profile_accounting/__openerp__.py
diff --git a/addons/profile_manufacturing/__terp__.py b/addons/profile_manufacturing/__openerp__.py
similarity index 100%
rename from addons/profile_manufacturing/__terp__.py
rename to addons/profile_manufacturing/__openerp__.py
diff --git a/addons/profile_tools/__terp__.py b/addons/profile_tools/__openerp__.py
similarity index 100%
rename from addons/profile_tools/__terp__.py
rename to addons/profile_tools/__openerp__.py
diff --git a/addons/purchase/__terp__.py b/addons/purchase/__openerp__.py
similarity index 100%
rename from addons/purchase/__terp__.py
rename to addons/purchase/__openerp__.py
diff --git a/addons/purchase_analytic_plans/__terp__.py b/addons/purchase_analytic_plans/__openerp__.py
similarity index 100%
rename from addons/purchase_analytic_plans/__terp__.py
rename to addons/purchase_analytic_plans/__openerp__.py
diff --git a/addons/purchase_manual/__terp__.py b/addons/purchase_manual/__openerp__.py
similarity index 100%
rename from addons/purchase_manual/__terp__.py
rename to addons/purchase_manual/__openerp__.py
diff --git a/addons/purchase_requisition/__terp__.py b/addons/purchase_requisition/__openerp__.py
similarity index 100%
rename from addons/purchase_requisition/__terp__.py
rename to addons/purchase_requisition/__openerp__.py
diff --git a/addons/report_designer/__terp__.py b/addons/report_designer/__openerp__.py
similarity index 100%
rename from addons/report_designer/__terp__.py
rename to addons/report_designer/__openerp__.py
diff --git a/addons/report_intrastat/__terp__.py b/addons/report_intrastat/__openerp__.py
similarity index 100%
rename from addons/report_intrastat/__terp__.py
rename to addons/report_intrastat/__openerp__.py
diff --git a/addons/resource/__terp__.py b/addons/resource/__openerp__.py
similarity index 100%
rename from addons/resource/__terp__.py
rename to addons/resource/__openerp__.py
diff --git a/addons/sale/__terp__.py b/addons/sale/__openerp__.py
similarity index 100%
rename from addons/sale/__terp__.py
rename to addons/sale/__openerp__.py
diff --git a/addons/sale_analytic_plans/__terp__.py b/addons/sale_analytic_plans/__openerp__.py
similarity index 100%
rename from addons/sale_analytic_plans/__terp__.py
rename to addons/sale_analytic_plans/__openerp__.py
diff --git a/addons/sale_crm/__terp__.py b/addons/sale_crm/__openerp__.py
similarity index 100%
rename from addons/sale_crm/__terp__.py
rename to addons/sale_crm/__openerp__.py
diff --git a/addons/sale_delivery_report/__terp__.py b/addons/sale_delivery_report/__openerp__.py
similarity index 100%
rename from addons/sale_delivery_report/__terp__.py
rename to addons/sale_delivery_report/__openerp__.py
diff --git a/addons/sale_journal/__terp__.py b/addons/sale_journal/__openerp__.py
similarity index 100%
rename from addons/sale_journal/__terp__.py
rename to addons/sale_journal/__openerp__.py
diff --git a/addons/scrum/__terp__.py b/addons/scrum/__openerp__.py
similarity index 100%
rename from addons/scrum/__terp__.py
rename to addons/scrum/__openerp__.py
diff --git a/addons/service/__terp__.py b/addons/service/__openerp__.py
similarity index 100%
rename from addons/service/__terp__.py
rename to addons/service/__openerp__.py
diff --git a/addons/smtpclient/__terp__.py b/addons/smtpclient/__openerp__.py
similarity index 100%
rename from addons/smtpclient/__terp__.py
rename to addons/smtpclient/__openerp__.py
diff --git a/addons/stock/__terp__.py b/addons/stock/__openerp__.py
similarity index 100%
rename from addons/stock/__terp__.py
rename to addons/stock/__openerp__.py
diff --git a/addons/stock_invoice_directly/__terp__.py b/addons/stock_invoice_directly/__openerp__.py
similarity index 100%
rename from addons/stock_invoice_directly/__terp__.py
rename to addons/stock_invoice_directly/__openerp__.py
diff --git a/addons/stock_location/__terp__.py b/addons/stock_location/__openerp__.py
similarity index 100%
rename from addons/stock_location/__terp__.py
rename to addons/stock_location/__openerp__.py
diff --git a/addons/stock_no_autopicking/__terp__.py b/addons/stock_no_autopicking/__openerp__.py
similarity index 100%
rename from addons/stock_no_autopicking/__terp__.py
rename to addons/stock_no_autopicking/__openerp__.py
diff --git a/addons/stock_planning/__terp__.py b/addons/stock_planning/__openerp__.py
similarity index 100%
rename from addons/stock_planning/__terp__.py
rename to addons/stock_planning/__openerp__.py
diff --git a/addons/subscription/__terp__.py b/addons/subscription/__openerp__.py
similarity index 100%
rename from addons/subscription/__terp__.py
rename to addons/subscription/__openerp__.py
diff --git a/addons/survey/__terp__.py b/addons/survey/__openerp__.py
similarity index 100%
rename from addons/survey/__terp__.py
rename to addons/survey/__openerp__.py
diff --git a/addons/thunderbird/__terp__.py b/addons/thunderbird/__openerp__.py
similarity index 100%
rename from addons/thunderbird/__terp__.py
rename to addons/thunderbird/__openerp__.py
diff --git a/addons/users_ldap/__terp__.py b/addons/users_ldap/__openerp__.py
similarity index 100%
rename from addons/users_ldap/__terp__.py
rename to addons/users_ldap/__openerp__.py
diff --git a/addons/warning/__terp__.py b/addons/warning/__openerp__.py
similarity index 100%
rename from addons/warning/__terp__.py
rename to addons/warning/__openerp__.py
diff --git a/addons/wiki/__terp__.py b/addons/wiki/__openerp__.py
similarity index 100%
rename from addons/wiki/__terp__.py
rename to addons/wiki/__openerp__.py
diff --git a/addons/wiki_faq/__terp__.py b/addons/wiki_faq/__openerp__.py
similarity index 100%
rename from addons/wiki_faq/__terp__.py
rename to addons/wiki_faq/__openerp__.py
diff --git a/addons/wiki_quality_manual/__terp__.py b/addons/wiki_quality_manual/__openerp__.py
similarity index 100%
rename from addons/wiki_quality_manual/__terp__.py
rename to addons/wiki_quality_manual/__openerp__.py