diff --git a/resources/views/service-template/edit.blade.php b/resources/views/service-template/edit.blade.php
index 32466abbf0..4b362737de 100644
--- a/resources/views/service-template/edit.blade.php
+++ b/resources/views/service-template/edit.blade.php
@@ -5,9 +5,9 @@
 @section('content')
     <div class="container">
         <div class="row">
-            <form action="{{ route('services.templates.update', $service_template->service_template_id) }}" method="POST" role="form"
+            <form action="{{ route('services.templates.update', $service_template->id) }}" method="POST" role="form"
                   class="form-horizontal services-templates-form col-md-10 col-md-offset-1 col-sm-12">
-                <legend>@lang('Edit Service Template'): {{ $service_template->service_template_name }}</legend>
+                <legend>@lang('Edit Service Template'): {{ $service_template->name }}</legend>
                 <div class='alert alert-info'>Service Template will edited for the specified Device Group.</div>
                 {{ method_field('PUT') }}
                 @csrf
diff --git a/resources/views/service-template/form.blade.php b/resources/views/service-template/form.blade.php
index c2589689f9..88b187bcea 100644
--- a/resources/views/service-template/form.blade.php
+++ b/resources/views/service-template/form.blade.php
@@ -1,8 +1,8 @@
 <div class="form-group @if($errors->has('name')) has-error @endif">
     <label for="name" class="control-label col-sm-3 col-md-2 text-nowrap">@lang('Name')</label>
     <div class="col-sm-9 col-md-10">
-        <input type="text" class="form-control" id="service_template_name" name="service_template_name" value="{{ old('service_template_name', $service_template->service_template_name) }}">
-        <span class="help-block">{{ $errors->first('service_template_name') }}</span>
+        <input type="text" class="form-control" id="name" name="name" value="{{ old('name', $service_template->name) }}">
+        <span class="help-block">{{ $errors->first('name') }}</span>
     </div>
 </div>
 
@@ -21,19 +21,19 @@
 <div class="form-group @if($errors->has('type')) has-error @endif">
     <label for="type" class="control-label col-sm-3 col-md-2">@lang('Check Type')</label>
     <div class="col-sm-9 col-md-10">
-        <select class="form-control" id="service_template_type" name="service_template_type">
+        <select class="form-control" id="type" name="type">
             @foreach($services as $current_service)
                 <option value="{{ $current_service }}">{{ $current_service }}</option>
             @endforeach
         </select>
-        <span class="help-block">{{ $errors->first('service_template_type') }}</span>
+        <span class="help-block">{{ $errors->first('type') }}</span>
     </div>
 </div>
 
 <div class="form-group @if($errors->has('desc')) has-error @endif">
     <label for="desc" class="control-label col-sm-3 col-md-2 text-nowrap">@lang('Description')</label>
     <div class="col-sm-9 col-md-10">
-        <input type="text" class="form-control" id="service_template_desc" name="service_template_desc" value="{{ old('service_template_desc', $service_template->service_template_desc) }}">
+        <input type="text" class="form-control" id="desc" name="desc" value="{{ old('desc', $service_template->desc) }}">
         <span class="help-block">{{ $errors->first('desc') }}</span>
     </div>
 </div>
@@ -41,7 +41,7 @@
 <div class="form-group @if($errors->has('ip')) has-error @endif">
     <label for="ip" class="control-label col-sm-3 col-md-2 text-nowrap">@lang('Remote Host')</label>
     <div class="col-sm-9 col-md-10">
-        <input type="text" class="form-control" id="service_template_ip" name="service_template_ip" value="{{ old('service_template_ip', $service_template->service_template_ip) }}">
+        <input type="text" class="form-control" id="ip" name="ip" value="{{ old('ip', $service_template->ip) }}">
         <span class="help-block">{{ $errors->first('ip') }}</span>
     </div>
 </div>
@@ -49,7 +49,7 @@
 <div class="form-group @if($errors->has('param')) has-error @endif">
     <label for="param" class="control-label col-sm-3 col-md-2 text-nowrap">@lang('Parameters')</label>
     <div class="col-sm-9 col-md-10">
-        <input type="text" class="form-control" id="service_template_param" name="service_template_param" value="{{ old('service_template_param', $service_template->service_template_param) }}">
+        <input type="text" class="form-control" id="param" name="param" value="{{ old('param', $service_template->param) }}">
         <span class="help-block">{{ $errors->first('param') }}</span>
     </div>
 </div>
@@ -63,7 +63,7 @@
 <div class="form-group @if($errors->has('ignore')) has-error @endif">
     <label for="ignore" class="control-label col-sm-3 col-md-2 text-nowrap">@lang('Ignore alert tag')</label>
     <div class="col-sm-9 col-md-10">
-        <input type="checkbox" class="form-control" id="service_template_ignore" name="service_template_ignore" value="{{ old('service_template_ignore', $service_template->service_template_ignore) }}">
+        <input type="checkbox" class="form-control" id="ignore" name="ignore" value="{{ old('ignore', $service_template->ignore) }}">
         <span class="help-block">{{ $errors->first('ignore') }}</span>
     </div>
 </div>
@@ -71,7 +71,7 @@
 <div class="form-group @if($errors->has('ip')) has-error @endif">
     <label for="ip" class="control-label col-sm-3 col-md-2 text-nowrap">@lang('Disable polling and alerting')</label>
     <div class="col-sm-9 col-md-10">
-        <input type="checkbox" class="form-control" id="service_template_disabled" name="service_template_disabled" value="{{ old('service_template_disabled', $service_template->service_template_disabled) }}">
+        <input type="checkbox" class="form-control" id="disabled" name="disabled" value="{{ old('disabled', $service_template->disabled) }}">
         <span class="help-block">{{ $errors->first('disabled') }}</span>
     </div>
 </div>
diff --git a/resources/views/service-template/index.blade.php b/resources/views/service-template/index.blade.php
index 204ebff199..50f9ce9812 100644
--- a/resources/views/service-template/index.blade.php
+++ b/resources/views/service-template/index.blade.php
@@ -36,29 +36,29 @@
                             </thead>
                             <tbody>
                                 @foreach($service_templates as $service_template)
-                                    <tr id="row_{{ $service_template->service_template_id }}">
-                                        <td>{{ $service_template->service_template_name }}</td>
-                                        <td>{{ $service_template->service_template_type }}</td>
-                                        <td>{{ $service_template->service_template_param }}</td>
-                                        <td>{{ $service_template->service_template_ip }}</td>
-                                        <td>{{ $service_template->service_template_desc }}</td>
-                                        <td>{{ $service_template->service_template_changed }}</td>
-                                        <td>{{ $service_template->service_template_ignore }}</td>
-                                        <td>{{ $service_template->service_template_disabled }}</td>
+                                    <tr id="row_{{ $service_template->id }}">
+                                        <td>{{ $service_template->name }}</td>
+                                        <td>{{ $service_template->type }}</td>
+                                        <td>{{ $service_template->param }}</td>
+                                        <td>{{ $service_template->ip }}</td>
+                                        <td>{{ $service_template->desc }}</td>
+                                        <td>{{ $service_template->changed }}</td>
+                                        <td>{{ $service_template->ignore }}</td>
+                                        <td>{{ $service_template->disabled }}</td>
                                         <td>
                                             <button type="button" title="@lang('Apply Services for this Service Template')" class="btn btn-success btn-sm" aria-label="@lang('Apply')"
-                                                    onclick="discover_st(this, '{{ $service_template->service_template_id }}')">
+                                                    onclick="discover_st(this, '{{ $service_template->id }}')">
                                                 <i
                                                     class="fa fa-plus" aria-hidden="true"></i></button>
                                             <button type="button" title="@lang('Remove Services for this Service Template')" class="btn btn-warning btn-sm" aria-label="@lang('Apply')"
-                                                    onclick="remove_st(this, '{{ $service_template->service_template_id }}')">
+                                                    onclick="remove_st(this, '{{ $service_template->id }}')">
                                                 <i
                                                     class="fa fa-minus" aria-hidden="true"></i></button>
                                             <a type="button" title="@lang('edit Service Template')" class="btn btn-primary btn-sm" aria-label="@lang('Edit')"
-                                            href="{{ route('services.templates.edit', $service_template->service_template_id) }}">
+                                            href="{{ route('services.templates.edit', $service_template->id) }}">
                                                 <i class="fa fa-pencil" aria-hidden="true"></i></a>
                                             <button type="button" class="btn btn-danger btn-sm" title="@lang('delete Service Template')" aria-label="@lang('Delete')"
-                                                    onclick="delete_st(this, '{{ $service_template->service_template_name }}', '{{ route('services.templates.destroy', $service_template->service_template_id) }}')">
+                                                    onclick="delete_st(this, '{{ $service_template->name }}', '{{ route('services.templates.destroy', $service_template->id) }}')">
                                                 <i
                                                     class="fa fa-trash" aria-hidden="true"></i></button>
                                         </td>
@@ -75,12 +75,12 @@
 
 @section('scripts')
     <script>
-        function discover_st(button, service_template_id) {
+        function discover_st(button, id) {
             if (confirm('@lang('Are you sure you want to create Services for ')' + name + '?')) {
                 $.ajax({
                     type: 'POST',
                     url: 'ajax_form.php',
-                    data: { type: "discover-service-template", service_template_id: service_template_id },
+                    data: { type: "discover-service-template", service_template_id: id },
                     dataType: "json",
                     success: function(data){
                         if(data['status'] == 'ok') {
@@ -95,12 +95,12 @@
                 });
             }
         }
-        function remove_st(button, service_template_id) {
+        function remove_st(button, id) {
             if (confirm('@lang('Are you sure you want to remove all Services created by ')' + name + '?')) {
                 $.ajax({
                     type: 'POST',
                     url: 'ajax_form.php',
-                    data: { type: "remove-service-template", service_template_id: service_template_id },
+                    data: { type: "remove-service-template", service_template_id: id },
                     dataType: "json",
                     success: function(data){
                         if(data['status'] == 'ok') {
@@ -115,12 +115,12 @@
                 });
             }
         }
-        function delete_st(button, service_template_id) {
+        function delete_st(button, id) {
             if (confirm('@lang('Are you sure you want to delete AND remove all Services created by ')' + name + '?')) {
                 $.ajax({
                     type: 'POST',
                     url: 'ajax_form.php',
-                    data: { type: "delete-service-template", service_template_id: service_template_id },
+                    data: { type: "delete-service-template", service_template_id: id },
                     dataType: "json",
                     success: function(data){
                         if(data['status'] == 'ok') {