diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index 7bcefe4..bc3b687 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -27,8 +27,8 @@ class MatchesController < ApplicationController
       @match = Match.find (params[:match])
     end
     if @match
-      @w1 = Wrestler.find(@match.r_id)
-      @w2 = Wrestler.find(@match.g_id)
+      @w1 = Wrestler.find(@match.w1)
+      @w2 = Wrestler.find(@match.w2)
     end
   end
 
@@ -92,6 +92,6 @@ class MatchesController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def match_params
-      params.require(:match).permit(:r_id, :g_id, :g_stat, :r_stat, :winner_id, :win_type, :score, :finished)
+      params.require(:match).permit(:w1, :w2, :g_stat, :r_stat, :winner_id, :win_type, :score, :finished)
     end
 end
diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb
index e85d0c4..55ac453 100644
--- a/app/views/matches/_form.html.erb
+++ b/app/views/matches/_form.html.erb
@@ -12,12 +12,12 @@
   <% end %>
 
   <div class="field">
-    <%= f.label :r_id %><br>
-    <%= f.number_field :r_id %>
+    <%= f.label :w1_name %><br>
+    <%= f.number_field :w1_name %>
   </div>
   <div class="field">
-    <%= f.label :g_id %><br>
-    <%= f.number_field :g_id %>
+    <%= f.label :w2_name %><br>
+    <%= f.number_field :w2_name %>
   </div>
   <div class="field">
     <%= f.label :g_stat %><br>
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index 8389674..661990c 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -19,10 +19,8 @@
   <tbody>
     <% @matches.each do |match| %>
       <tr>
-        <td><%= match.r_id %></td>
-        <td><%= match.g_id %></td>
-        <td><%= match.g_stat %></td>
-        <td><%= match.r_stat %></td>
+        <td><%= match.w1_name %></td>
+        <td><%= match.w2_name %></td>
         <td><%= match.winner_id %></td>
         <td><%= match.win_type %></td>
         <td><%= match.score %></td>
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index 6eddc70..1d49910 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -2,12 +2,12 @@
 
 <p>
   <strong>R:</strong>
-  <%= @match.r_id %>
+  <%= @match.w1_name %>
 </p>
 
 <p>
   <strong>G:</strong>
-  <%= @match.g_id %>
+  <%= @match.w2_name %>
 </p>
 
 <p>