diff --git a/app/views/compound_metric_configurations/_form.html.erb b/app/views/compound_metric_configurations/_form.html.erb
index 1f493f7..4dcdaf0 100644
--- a/app/views/compound_metric_configurations/_form.html.erb
+++ b/app/views/compound_metric_configurations/_form.html.erb
@@ -1,9 +1,9 @@
-<%= render :partial => 'shared/form_errors', :locals => {:object => @compound_metric_configuration} %>
+<%= render :partial => 'shared/form_errors', :locals => {:object => @metric_configuration} %>
 <div class="row margin-left-none">
   <div class="form-table col-md-9">
 
     <%= f.fields_for :metric do |metric| %>
-    <%= render partial: "metric_options", :locals => {:f => metric, :metric => @compound_metric_configuration.metric} %>
+    <%= render partial: "metric_options", :locals => {:f => metric, :metric => @metric_configuration.metric} %>
     <% end %>
 
     <div class="form-row">
@@ -18,10 +18,10 @@
       </div>
     </div>
 
-    <% if @compound_metric_configuration.persisted? %>
-      <%= hidden_field_tag(:reading_group_id, @compound_metric_configuration.reading_group_id) %>
-      <%= hidden_field_tag(:kalibro_configuration_id, @compound_metric_configuration.kalibro_configuration_id) %>
-      <%= link_to t('back'), kalibro_configuration_path(@compound_metric_configuration.kalibro_configuration_id), class: 'btn btn-default' %>
+    <% if @metric_configuration.persisted? %>
+      <%= hidden_field_tag(:reading_group_id, @metric_configuration.reading_group_id) %>
+      <%= hidden_field_tag(:kalibro_configuration_id, @metric_configuration.kalibro_configuration_id) %>
+      <%= link_to t('back'), kalibro_configuration_path(@metric_configuration.kalibro_configuration_id), class: 'btn btn-default' %>
     <% else %>
       <div class="form-row">
         <div class="field-container">
@@ -34,8 +34,8 @@
           </p>
         </div>
       </div>
-      <%= f.hidden_field(:kalibro_configuration_id, value: @kalibro_configuration_id) %>
-      <%= link_to t('back'), kalibro_configuration_path(@kalibro_configuration_id), class: 'btn btn-default' %>
+      <%= f.hidden_field(:kalibro_configuration_id, value: @kalibro_configuration.id) %>
+      <%= link_to t('back'), kalibro_configuration_path(@kalibro_configuration.id), class: 'btn btn-default' %>
     <% end %>
     <%= f.submit t('save'), class: 'btn btn-primary' %>
   </div>
diff --git a/app/views/compound_metric_configurations/edit.html.erb b/app/views/compound_metric_configurations/edit.html.erb
index 9307798..25b58fb 100644
--- a/app/views/compound_metric_configurations/edit.html.erb
+++ b/app/views/compound_metric_configurations/edit.html.erb
@@ -6,7 +6,7 @@
 
 <br>
 
-<%= form_for(@compound_metric_configuration, :url => kalibro_configuration_compound_metric_configuration_update_path(@compound_metric_configuration.kalibro_configuration_id, @compound_metric_configuration.id), method: :put) do |f| %>
+<%= form_for(@metric_configuration, :url => kalibro_configuration_compound_metric_configuration_update_path(@metric_configuration.kalibro_configuration_id, @metric_configuration.id), method: :put) do |f| %>
   <%= render partial: 'form', locals: {f: f} %>
 <% end %>
 
diff --git a/app/views/compound_metric_configurations/new.html.erb b/app/views/compound_metric_configurations/new.html.erb
index 4887a93..263c174 100644
--- a/app/views/compound_metric_configurations/new.html.erb
+++ b/app/views/compound_metric_configurations/new.html.erb
@@ -6,7 +6,7 @@
 
 <br>
 
-<%= form_for(@compound_metric_configuration, :url => kalibro_configuration_compound_metric_configurations_path(@kalibro_configuration_id)) do |f| %>
+<%= form_for(@metric_configuration, :url => kalibro_configuration_compound_metric_configurations_path(@kalibro_configuration.id)) do |f| %>
   <%= render partial: 'form', locals: {f: f} %>
 <% end %>
 
diff --git a/app/views/compound_metric_configurations/show.html.erb b/app/views/compound_metric_configurations/show.html.erb
index 700f9c0..418a9b4 100644
--- a/app/views/compound_metric_configurations/show.html.erb
+++ b/app/views/compound_metric_configurations/show.html.erb
@@ -1,39 +1,39 @@
 <div class="page-header">
-  <h1><%=@compound_metric_configuration.metric.name %></h1>
+  <h1><%=@metric_configuration.metric.name %></h1>
 </div>
 
 <p>
   <strong> <%= t('description') %>:</strong>
-  <% if @compound_metric_configuration.metric.description.nil? %>
+  <% if @metric_configuration.metric.description.nil? %>
     <%= t('no_description') %>
   <% else %>
-    <%= @compound_metric_configuration.metric.description %>
+    <%= @metric_configuration.metric.description %>
   <% end %>
 </p>
 
 <p>
   <strong> <%= t('script') %>:</strong>
-  <%= @compound_metric_configuration.metric.script %>
+  <%= @metric_configuration.metric.script %>
 </p>
 
 <p>
   <strong> <%= t('scope') %>:</strong>
-  <%= @compound_metric_configuration.metric.scope %>
+  <%= @metric_configuration.metric.scope %>
 </p>
 
 <p>
   <strong> <%= t('code') %>:</strong>
-  <%= @compound_metric_configuration.metric.code %>
+  <%= @metric_configuration.metric.code %>
 </p>
 
 <p>
   <strong> <%= t('weight') %>:</strong>
-  <%= @compound_metric_configuration.weight %>
+  <%= @metric_configuration.weight %>
 </p>
 
 <p>
   <strong> <%= t('metric_configurations_aggregation') %>:</strong>
-  <%= @compound_metric_configuration.aggregation_form %>
+  <%= @metric_configuration.aggregation_form %>
 </p>
 
 <p>
@@ -44,9 +44,9 @@
 <hr>
 
 <h2>  <%= t('ranges') %> </h2>
-<% if kalibro_configuration_owner? @compound_metric_configuration.kalibro_configuration_id %>
-  <%= link_to t_action(:add, KalibroRange), kalibro_configuration_metric_configuration_new_kalibro_range_path(@compound_metric_configuration.kalibro_configuration_id,
-      @compound_metric_configuration.id), class: 'btn btn-info' %>
+<% if kalibro_configuration_owner? @metric_configuration.kalibro_configuration_id %>
+  <%= link_to t_action(:add, KalibroRange), kalibro_configuration_metric_configuration_new_kalibro_range_path(@metric_configuration.kalibro_configuration_id,
+      @metric_configuration.id), class: 'btn btn-info' %>
 <% end %>
 
 <table class="table table-hover">
@@ -69,10 +69,10 @@
 <hr>
 
 <p>
- <%= link_to t('back'), kalibro_configuration_path(@compound_metric_configuration.kalibro_configuration_id), class: 'btn btn-default' %>
-<% if kalibro_configuration_owner? @compound_metric_configuration.kalibro_configuration_id %>
-      <%= link_to t_action(:destroy, MetricConfiguration), kalibro_configuration_metric_configuration_path(@compound_metric_configuration.kalibro_configuration_id,
-      @compound_metric_configuration.id), method: :delete, data: { confirm: t('want_destroy_metric_configuration') },
+ <%= link_to t('back'), kalibro_configuration_path(@metric_configuration.kalibro_configuration_id), class: 'btn btn-default' %>
+<% if kalibro_configuration_owner? @metric_configuration.kalibro_configuration_id %>
+      <%= link_to t_action(:destroy, MetricConfiguration), kalibro_configuration_metric_configuration_path(@metric_configuration.kalibro_configuration_id,
+      @metric_configuration.id), method: :delete, data: { confirm: t('want_destroy_metric_configuration') },
       class: 'btn btn-danger' %>
  <% end %>
 </p>
diff --git a/app/views/metric_configurations/_form.html.erb b/app/views/metric_configurations/_form.html.erb
index b7e0c60..071b57f 100644
--- a/app/views/metric_configurations/_form.html.erb
+++ b/app/views/metric_configurations/_form.html.erb
@@ -42,7 +42,7 @@
             </p>
           </div>
         </div>
-        <%= f.hidden_field(:kalibro_configuration_id, value: @kalibro_configuration_id) %>
+        <%= f.hidden_field(:kalibro_configuration_id, value: @kalibro_configuration.id) %>
     <% end %>
 
   </div>
diff --git a/app/views/metric_configurations/edit.html.erb b/app/views/metric_configurations/edit.html.erb
index a81e6f3..2c3680e 100644
--- a/app/views/metric_configurations/edit.html.erb
+++ b/app/views/metric_configurations/edit.html.erb
@@ -2,7 +2,7 @@
   <h1><%= t('editing_metric_configuration') %></h1>
 </div>
 
-<%= form_for(@metric_configuration, :url => kalibro_configuration_metric_configuration_update_path(@kalibro_configuration_id, @metric_configuration.id), method: :put) do |f| %>
+<%= form_for(@metric_configuration, :url => kalibro_configuration_metric_configuration_update_path(@kalibro_configuration.id, @metric_configuration.id), method: :put) do |f| %>
   <%= render partial: 'form', locals: {f: f} %>
   <div class="row margin-left-none" style="margin-top: 20px">
   	<%= f.submit t('save'), class: 'btn btn-primary' %>
diff --git a/app/views/metric_configurations/new.html.erb b/app/views/metric_configurations/new.html.erb
index ae8d1ef..e4cc33b 100644
--- a/app/views/metric_configurations/new.html.erb
+++ b/app/views/metric_configurations/new.html.erb
@@ -24,10 +24,10 @@
 
 <br>
 
-<%= form_for(@metric_configuration, :url => kalibro_configuration_metric_configurations_path(@kalibro_configuration_id)) do |f| %>
+<%= form_for(@metric_configuration, :url => kalibro_configuration_metric_configurations_path(@kalibro_configuration.id)) do |f| %>
   <%= render partial: 'form', locals: {f: f} %>
   <div class="row margin-left-none" style="margin-top: 20px">
   	<%= f.submit t('save'), class: 'btn btn-primary' %>
-    <%= link_to t('back'),  kalibro_configuration_choose_metric_path(@kalibro_configuration_id), class: 'btn btn-default' %>
+    <%= link_to t('back'),  kalibro_configuration_choose_metric_path(@kalibro_configuration.id), class: 'btn btn-default' %>
 	</div>
 <% end %>
--
libgit2 0.21.2