diff --git a/khana/objective/views.py b/khana/objective/views.py
index 05da50b..a5717ac 100644
--- a/khana/objective/views.py
+++ b/khana/objective/views.py
@@ -259,11 +259,11 @@ def routine_details(request, routineid):
         if not skill_link.skill.is_competitive:
             is_competitive = False
 
-        if skill_link.skill.ageBoy is not None and skill_link.skill.ageBoy > age_boy:
-            age_boy = skill_link.skill.ageBoy
+        if skill_link.skill.age_boy is not None and skill_link.skill.age_boy > age_boy:
+            age_boy = skill_link.skill.age_boy
 
-        if skill_link.skill.ageGirl is not None and skill_link.skill.ageGirl > age_girl:
-            age_girl = skill_link.skill.ageGirl
+        if skill_link.skill.age_girl is not None and skill_link.skill.age_girl > age_girl:
+            age_girl = skill_link.skill.age_girl
 
     if routine.skill_links.all().count() != 10:
         is_competitive = False
@@ -276,11 +276,11 @@ def routine_details(request, routineid):
     if routine.rank is None or routine.rank < rank:
         routine.rank = rank
 
-    if routine.ageBoy is None or routine.ageBoy < age_boy:
-        routine.ageBoy = age_boy
+    if routine.age_boy is None or routine.age_boy < age_boy:
+        routine.age_boy = age_boy
 
-    if routine.ageGirl is None or routine.ageGirl < age_girl:
-        routine.ageGirl = age_girl
+    if routine.age_girl is None or routine.age_girl < age_girl:
+        routine.age_girl = age_girl
 
     routine.is_competitive = is_competitive
 
diff --git a/khana/people/templatetags/statistics.py b/khana/people/templatetags/statistics.py
index 4eac9ee..e9e5405 100644
--- a/khana/people/templatetags/statistics.py
+++ b/khana/people/templatetags/statistics.py
@@ -224,11 +224,11 @@ def display_stats(gymnast):
     context.update(__getInformationsFromRank(gymnast, gymnast_known_skills))
 
     if gymnast.gender:
-        context["skillByAge"] = Skill.objects.filter(ageGirl__lte=gymnast.age).exclude(
+        context["skillByAge"] = Skill.objects.filter(age_girl__lte=gymnast.age).exclude(
             cando__gymnast=gymnast.id
         )
     else:
-        context["skillByAge"] = Skill.objects.filter(ageBoy__lte=gymnast.age).exclude(
+        context["skillByAge"] = Skill.objects.filter(age_boy__lte=gymnast.age).exclude(
             cando__gymnast=gymnast.id
         )
 
@@ -257,11 +257,11 @@ def display_level(gymnast):
     # context.update(__getInformationsFromRank(gymnast, gymnast_known_skills))
 
     if gymnast.gender:
-        context["skillByAge"] = Skill.objects.filter(ageGirl__lte=gymnast.age).exclude(
+        context["skillByAge"] = Skill.objects.filter(age_girl__lte=gymnast.age).exclude(
             cando__gymnast=gymnast.id
         )
     else:
-        context["skillByAge"] = Skill.objects.filter(ageBoy__lte=gymnast.age).exclude(
+        context["skillByAge"] = Skill.objects.filter(age_boy__lte=gymnast.age).exclude(
             cando__gymnast=gymnast.id
         )
 
diff --git a/khana/people/views.py b/khana/people/views.py
index 5575bed..0d680fd 100644
--- a/khana/people/views.py
+++ b/khana/people/views.py
@@ -406,11 +406,11 @@ def gymnast_display_stats(request, gymnastid):
     context.update(__getInformationsFromRank(gymnast, gymnast_known_skills))
 
     if gymnast.gender:
-        context["skillByAge"] = Skill.objects.filter(ageGirl__lte=gymnast.age).exclude(
+        context["skillByAge"] = Skill.objects.filter(age_girl__lte=gymnast.age).exclude(
             cando__gymnast=gymnast.id
         )
     else:
-        context["skillByAge"] = Skill.objects.filter(ageBoy__lte=gymnast.age).exclude(
+        context["skillByAge"] = Skill.objects.filter(age_boy__lte=gymnast.age).exclude(
             cando__gymnast=gymnast.id
         )
 
@@ -438,11 +438,11 @@ def gymnast_display_level(request, gymnastid):
     context["totalKnownSkill"] = gymnast_known_skills
 
     if gymnast.gender:
-        context["skillByAge"] = Skill.objects.filter(ageGirl__lte=gymnast.age).exclude(
+        context["skillByAge"] = Skill.objects.filter(age_girl__lte=gymnast.age).exclude(
             cando__gymnast=gymnast.id
         )
     else:
-        context["skillByAge"] = Skill.objects.filter(ageBoy__lte=gymnast.age).exclude(
+        context["skillByAge"] = Skill.objects.filter(age_boy__lte=gymnast.age).exclude(
             cando__gymnast=gymnast.id
         )
 
diff --git a/static/js/skill.js b/static/js/skill.js
index e2a77c0..73bed0d 100644
--- a/static/js/skill.js
+++ b/static/js/skill.js
@@ -46,7 +46,7 @@ $(function(){
     });
 
     $('#id_ageBoy').keyup(function(){
-        $('#id_ageGirl').val($('#id_ageBoy').val());
+        $('#id_age_girl').val($('#id_age_boy').val());
     });
     
     setDifficulty = function()
diff --git a/templates/routine_details.html b/templates/routine_details.html
index 195dc84..4da2a1f 100644
--- a/templates/routine_details.html
+++ b/templates/routine_details.html
@@ -38,8 +38,8 @@
                     <div class="row">
                         <div class="col-3 text-center">Niveau : {{ routine.level }}</div>
                         <div class="col-3 text-center">Rank : {{ routine.rank }}</div>
-                        <div class="col-3 text-center">Age Boy : {{ routine.ageBoy }}</div>
-                        <div class="col-3 text-center">Age Girl : {{ routine.ageGirl }}</div>
+                        <div class="col-3 text-center">Age Boy : {{ routine.age_boy }}</div>
+                        <div class="col-3 text-center">Age Girl : {{ routine.age_girl }}</div>
                     </div>
                     <br>
                 </div>
diff --git a/templates/routine_list.html b/templates/routine_list.html
index fcb5d8c..2b0209f 100644
--- a/templates/routine_list.html
+++ b/templates/routine_list.html
@@ -51,8 +51,8 @@
                         <td class="text-center">{{ routine.difficulty }}</td>
                         <td class="text-center">{{ routine.level }}</td>
                         <td class="text-center">{{ routine.rank }}</td>
-                        <td class="text-center">{{ routine.ageGirl }}</td>
-                        <td class="text-center">{{ routine.ageBoy }}</td>
+                        <td class="text-center">{{ routine.age_girl }}</td>
+                        <td class="text-center">{{ routine.age_boy }}</td>
                     </tr>
                     {% endfor %}
                 </tbody>
diff --git a/templates/skill_list.html b/templates/skill_list.html
index 6a87e8d..d4d58e6 100644
--- a/templates/skill_list.html
+++ b/templates/skill_list.html
@@ -43,8 +43,8 @@
                             <td class="text-center">{% if skill.is_competitive %}<i class="fa fa-check text-success" aria-hidden="true"></i>{% else %}<i class="fa fa-times text-danger" aria-hidden="true"></i>{% endif %}</td>
                             <td class="text-center">{{ skill.level }}</td>
                             <td class="text-center">{{ skill.rank }}</td>
-                            <td class="text-center">{% if skill.ageBoy %}{{ skill.ageBoy }}{% endif %}</td>
-                            <td class="text-center">{% if skill.ageGirl %}{{ skill.ageGirl }}{% endif %}</td>
+                            <td class="text-center">{% if skill.age_boy %}{{ skill.age_boy }}{% endif %}</td>
+                            <td class="text-center">{% if skill.age_girl %}{{ skill.age_girl }}{% endif %}</td>
                             <td class="text-center">{{ skill.notation }}</td>
                         </tr>
                         {% endfor %}