diff --git a/addons/base_gengo/__init__.py b/addons/base_gengo/__init__.py
index b4fd54acd21..133fa90dc51 100644
--- a/addons/base_gengo/__init__.py
+++ b/addons/base_gengo/__init__.py
@@ -22,6 +22,5 @@
 import res_company
 import ir_translation
 import wizard
-import res_lang
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index d2e5893d166..b60d3db9682 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -34,7 +34,7 @@ Automated Translations through Gengo API
         'res_company_view.xml',
         'res_lang_view.xml',
 
-        'wizard/base_gengo_translation_view.xml',
+        'wizard/base_gengo_translations_view.xml',
            ],
     'demo_xml': [],
     'test': [],
diff --git a/addons/base_gengo/gengo_sync_schedular_data.xml b/addons/base_gengo/gengo_sync_schedular_data.xml
index 78d2c602ac5..bd52a9697d3 100644
--- a/addons/base_gengo/gengo_sync_schedular_data.xml
+++ b/addons/base_gengo/gengo_sync_schedular_data.xml
@@ -4,11 +4,11 @@
         <!--Scheduler sync Receive Request-->
         <record id="gengo_sync_receive_request_scheduler" model="ir.cron">
             <field name="name" >Gengo Sync Translation (Response)</field>
-            <field eval="False" name="active"/>
+            <field eval="True" name="active"/>
             <field name="interval_number">20</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
-            <field eval="'base.update.translations'" name="model"></field>
+            <field eval="'base.gengo.translations'" name="model"></field>
             <field eval="'_sync_response'" name="function"/>
             <field eval="'(20,)'" name="args"/>
         </record>
@@ -16,11 +16,11 @@
         <!--Scheduler Sync Send Request-->
         <record id="gengo_sync_send_request_scheduler" model="ir.cron">
             <field name="name" >Gengo Sync Translation (Request)</field>
-            <field eval="False" name="active"/>
+            <field eval="True" name="active"/>
             <field name="interval_number">20</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
-            <field eval="'base.update.translations'" name="model"></field>
+            <field eval="'base.gengo.translations'" name="model"></field>
             <field eval="'_sync_request'" name="function"/>
             <field eval="'(20,)'" name="args"/>
         </record>
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 610e46d05d2..22d7b343939 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -28,15 +28,10 @@ class res_company(osv.Model):
     _columns = {
            "gengo_private_key": fields.text("Gengo Private Key"),
            "gengo_public_key": fields.text("Gengo Public Key"),
-           "gengo_tier": fields.selection([('machine', 'Machine'),
-                                          ('standard', 'Standard'),
-                                          ('pro', 'Pro'),
-                                          ('ultra', 'Ultra')], "Tier Type", required=True),
            "gengo_comment": fields.text("Comments", help="This comment will be automatically be enclosed in each an every request sent to Gengo"),
            "gengo_auto_approve": fields.boolean("Auto Approve Translation ?", help="Jobs are Automatically Approved by Gengo."),
     }
 
     _defaults = {
-        "gengo_tier": "machine",
         "gengo_auto_approve": True,
     }
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
index fdc0c8833a6..0f99efc8ad0 100644
--- a/addons/base_gengo/res_company_view.xml
+++ b/addons/base_gengo/res_company_view.xml
@@ -18,7 +18,6 @@
                             </group>
                         </group>
                         <group col="4">
-                            <field name="gengo_tier" />
                             <field name="gengo_auto_approve"/>
                         </group>
                         <group string="Comments for Translator" col="1">
diff --git a/addons/base_gengo/res_lang.py b/addons/base_gengo/res_lang.py
deleted file mode 100644
index 43b867c4f76..00000000000
--- a/addons/base_gengo/res_lang.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Business Applications
-#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-
-class res_company(osv.Model):
-    _name = "res.lang"
-    _inherit = "res.lang"
-
-    _columns = {
-        'gengo_sync': fields.boolean('Gengo Auto Synchronize ?', help='If checked the language will be automatically synchronize translation periodically using gengo translation services.')
-    }
diff --git a/addons/base_gengo/res_lang_view.xml b/addons/base_gengo/res_lang_view.xml
deleted file mode 100644
index 38e6b995163..00000000000
--- a/addons/base_gengo/res_lang_view.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <!-- res.company form view -->
-        <record model="ir.ui.view" id="view_language_inherit_base_gengo_form">
-            <field name="name">res.lang.form.inherit</field>
-            <field name="inherit_id" ref="base.res_lang_form"/>
-            <field name="model">res.lang</field>
-            <field name="arch" type="xml">
-                <xpath expr="//sheet/group" position="inside">
-                    <field name="gengo_sync" />
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/base_gengo/wizard/__init__.py b/addons/base_gengo/wizard/__init__.py
index e3cd1565124..f5dd71be01c 100644
--- a/addons/base_gengo/wizard/__init__.py
+++ b/addons/base_gengo/wizard/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import base_gengo_translation
+import base_gengo_translations
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/base_gengo_translation.py b/addons/base_gengo/wizard/base_gengo_translations.py
similarity index 100%
rename from addons/base_gengo/wizard/base_gengo_translation.py
rename to addons/base_gengo/wizard/base_gengo_translations.py
diff --git a/addons/base_gengo/wizard/base_gengo_translation_view.xml b/addons/base_gengo/wizard/base_gengo_translations_view.xml
similarity index 100%
rename from addons/base_gengo/wizard/base_gengo_translation_view.xml
rename to addons/base_gengo/wizard/base_gengo_translations_view.xml