diff --git a/lib/NGCP/Panel/Controller/BatchProvisioning.pm b/lib/NGCP/Panel/Controller/BatchProvisioning.pm
index e250e1397e..073af05e75 100644
--- a/lib/NGCP/Panel/Controller/BatchProvisioning.pm
+++ b/lib/NGCP/Panel/Controller/BatchProvisioning.pm
@@ -200,6 +200,7 @@ sub create :Chained('template_list') :PathPart('create') :Args(0) {
                 }
                 delete $form->values->{reseller};
             }
+            $form->values->{lang} = delete $form->values->{scripting_lang};
             $form->values->{create_timestamp} = $form->values->{modify_timestamp} = NGCP::Panel::Utils::DateTime::current_local;
             my $template = $c->model('DB')->resultset('provisioning_templates')->create($form->values);
 
@@ -244,6 +245,7 @@ sub edit :Chained('template_base') :PathPart('edit') :Args(0) {
         $params = { $c->stash->{template_rs}->first->get_inflated_columns };
     }
     $params->{reseller}{id} = delete $params->{reseller_id};
+    $params->{scripting_lang} = delete $params->{lang};
     $params = merge($params, $c->session->{created_objects});
 
     $c->stash->{old_name} = $c->stash->{provisioning_templates}->{$template}->{name};
@@ -278,6 +280,7 @@ sub edit :Chained('template_base') :PathPart('edit') :Args(0) {
                 delete $form->values->{reseller};
             }
             $form->values->{modify_timestamp} = NGCP::Panel::Utils::DateTime::current_local;
+            $form->values->{lang} = delete $form->values->{scripting_lang};
             $c->stash->{template_rs}->update($form->values);
 
             delete $c->session->{created_objects}->{reseller};
diff --git a/lib/NGCP/Panel/Form/ProvisioningTemplate/Admin.pm b/lib/NGCP/Panel/Form/ProvisioningTemplate/Admin.pm
index df33419d71..cd1c0218dc 100644
--- a/lib/NGCP/Panel/Form/ProvisioningTemplate/Admin.pm
+++ b/lib/NGCP/Panel/Form/ProvisioningTemplate/Admin.pm
@@ -15,7 +15,7 @@ has_field 'reseller' => (
 has_block 'fields' => (
     tag => 'div',
     class => [qw/modal-body/],
-    render_list => [qw/reseller name description lang yaml/],
+    render_list => [qw/reseller name description scripting_lang yaml/],
 );
 
 1;
\ No newline at end of file
diff --git a/lib/NGCP/Panel/Form/ProvisioningTemplate/Reseller.pm b/lib/NGCP/Panel/Form/ProvisioningTemplate/Reseller.pm
index b6c2c9ee9c..19b99139c3 100644
--- a/lib/NGCP/Panel/Form/ProvisioningTemplate/Reseller.pm
+++ b/lib/NGCP/Panel/Form/ProvisioningTemplate/Reseller.pm
@@ -39,7 +39,7 @@ has_field 'description' => (
     },
 );
 
-has_field 'lang' => (
+has_field 'scripting_lang' => (
     type => 'Select',
     label => 'Language',
     options => [
@@ -123,7 +123,7 @@ has_field 'save' => (
 has_block 'fields' => (
     tag => 'div',
     class => [qw/modal-body/],
-    render_list => [qw/name description lang yaml/],
+    render_list => [qw/name description scripting_lang yaml/],
 );
 
 has_block 'actions' => (
diff --git a/lib/NGCP/Panel/Utils/ProvisioningTemplates.pm b/lib/NGCP/Panel/Utils/ProvisioningTemplates.pm
index 367a756e13..984b0d4e9a 100644
--- a/lib/NGCP/Panel/Utils/ProvisioningTemplates.pm
+++ b/lib/NGCP/Panel/Utils/ProvisioningTemplates.pm
@@ -1588,9 +1588,9 @@ sub _switch_lang {
 
     my ($context, $lang, %code) = @_;
 
-    die('template lang not defined') unless $lang;
-    die("unknown template lang '$lang'") unless exists $code{$lang};
-    die("template lang '$lang' not supported") unless grep { $_ eq $lang} @SUPPORTED_LANGS;
+    die('scripting lang not defined') unless $lang;
+    die("unknown scripting lang '$lang'") unless exists $code{$lang};
+    die("scripting lang '$lang' not supported") unless grep { $_ eq $lang } @SUPPORTED_LANGS;
     return &{$code{$lang}}($context);
 
 }