diff --git a/openerp/cli/scaffold.py b/openerp/cli/scaffold.py
index c882e33c0c3..58d63aed365 100644
--- a/openerp/cli/scaffold.py
+++ b/openerp/cli/scaffold.py
@@ -64,7 +64,7 @@ class Scaffold(Command):
         logging.disable(logging.CRITICAL)
         scaffold = ScaffoldModule(dest)
         if args.model:
-            scaffold.add_model(args.model)
+            scaffold.add_model(snake(args.model))
         if args.controller:
             scaffold.add_controller(args.controller)
         if args.web:
@@ -99,6 +99,7 @@ class ScaffoldModule(object):
         self.render_file('models.jinja2', model_file, model=model)
         self.render_file('ir.model.access.jinja2', self.path('security', 'ir.model.access.csv'),
                          if_exists='append', model=model)
+        self.append_manifest_list('data', 'security/ir.model.access.csv')
 
     def add_controller(self, controller):
         controller_module = snake(controller)
@@ -135,6 +136,7 @@ class ScaffoldModule(object):
             return manifest
 
     def append_manifest_list(self, key, value, unique=True):
+        # TODO: append value without altering serialized formatting
         vals = self.get_manifest(key, [])
         if unique and value in vals:
             return
diff --git a/openerp/cli/scaffold/ir.model.access.jinja2 b/openerp/cli/scaffold/ir.model.access.jinja2
index 96bec7ba9f2..bf00ba51972 100644
--- a/openerp/cli/scaffold/ir.model.access.jinja2
+++ b/openerp/cli/scaffold/ir.model.access.jinja2
@@ -1,6 +1,6 @@
 {% if file_created -%}id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink{%- endif %}
 {% if model -%}
-access_{{ module_name|snake }}_{{ model|snake }},{{- '' -}}
-access_{{ module_name|snake }}_{{ model|snake }},{{- '' -}}
-model_{{ module_name|snake }}_{{ model|snake }},,1,0,0,0
+access_{{ module_name }}_{{ model }},{{- '' -}}
+access_{{ module_name }}_{{ model }},{{- '' -}}
+model_{{ module_name }}_{{ model }},,1,0,0,0
 {%- endif %}
diff --git a/openerp/cli/scaffold/models.jinja2 b/openerp/cli/scaffold/models.jinja2
index 6fe3aceadd3..d5c82cfa7c6 100644
--- a/openerp/cli/scaffold/models.jinja2
+++ b/openerp/cli/scaffold/models.jinja2
@@ -2,7 +2,7 @@
 from openerp.osv import orm, fields
 
 class {{ model }}(orm.Model):
-    _name = "{{ module_name|snake }}.{{ model|snake }}"
+    _name = "{{ module_name }}.{{ model }}"
 
     _columns = {
         'name': fields.char(),
diff --git a/openerp/cli/scaffold/webclient_css.jinja2 b/openerp/cli/scaffold/webclient_css.jinja2
index b4955fa33ce..b1d4da5c22b 100644
--- a/openerp/cli/scaffold/webclient_css.jinja2
+++ b/openerp/cli/scaffold/webclient_css.jinja2
@@ -1,4 +1,4 @@
 @charset "utf-8";
-.openerp .oe_{{ module_name|snake }} {
+.openerp .oe_{{ module_name }} {
     background: white;
 }
diff --git a/openerp/cli/scaffold/webclient_js.jinja2 b/openerp/cli/scaffold/webclient_js.jinja2
index 2ee203baeb4..34a168961ae 100644
--- a/openerp/cli/scaffold/webclient_js.jinja2
+++ b/openerp/cli/scaffold/webclient_js.jinja2
@@ -1,9 +1,14 @@
-openerp.{{ module_name|snake }} = function (instance) {
+openerp.{{ module_name }} = function (instance) {
 
 var _t = instance.web._t,
    _lt = instance.web._lt;
 var QWeb = instance.web.qweb;
 
-instance.{{ module_name|snake }}.MyClientAction = null; // TODO: scaffold client action
+instance.web.WebClient.include({
+    show_application: function () {
+        console.log("Show application");
+        return this._super.apply(this, arguments);
+    };
+});
 
 };