diff --git a/stock/templates/registered/timermanagement.html b/stock/templates/registered/timermanagement.html
index 0f34953c..1b091272 100755
--- a/stock/templates/registered/timermanagement.html
+++ b/stock/templates/registered/timermanagement.html
@@ -25,8 +25,8 @@
         <h4><b>Next Timer</b></h4>
         <table class="table table-responsive table-bordered">
             <tr>
-                <th style="width:150px" class="text-center">Fleet Name</th>
-                <th class="text-center">Fleet Type</th>
+                <th style="width:150px" class="text-center">Details</th>
+                <th class="text-center">Objective</th>
                 <th class="text-center">System</th>
                 <th class="text-center">Structure</th>
                 <th class="text-center">Eve Time</th>
@@ -42,21 +42,21 @@
                         {% else %}
                     <tr class="info">
                 {% endifequal %}
-                <td style="width:150px" class="text-center">{{ closest_timer.name }}</td>
+                <td style="width:150px" class="text-center">{{ closest_timer.details }}</td>
                 <td class="text-center">
-                    {% ifequal closest_timer.fleet_type "Armor" %}
+                    {% ifequal closest_timer.objective "Hostile" %}
                         <div class="label label-danger">
-                            Armor
+                            Hostile
                         </div>
                     {% endifequal %}
-                    {% ifequal closest_timer.fleet_type "Shield" %}
+                    {% ifequal closest_timer.objective "Friendly" %}
                         <div class="label label-primary">
-                            Shield
+                            Friendly
                         </div>
                     {% endifequal %}
-                    {% ifequal closest_timer.fleet_type "Other" %}
+                    {% ifequal closest_timer.objective "Neutral" %}
                         <div class="label label-default">
-                            Other
+                            Neutral
                         </div>
                     {% endifequal %}
                 </td>
@@ -119,8 +119,8 @@
         <h4><b>Future Timers</b></h4>
         <table class="table table-bordered">
             <tr>
-                <th style="width:150px" class="text-center">Fleet Name</th>
-                <th class="text-center">Fleet Type</th>
+                <th style="width:150px" class="text-center">Details</th>
+                <th class="text-center">Objective</th>
                 <th class="text-center">System</th>
                 <th class="text-center">Structure</th>
                 <th class="text-center">Eve Time</th>
@@ -137,21 +137,21 @@
                             {% else %}
                         <tr class="info">
                     {% endifequal %}
-                <td style="width:150px" class="text-center">{{ timer.name }}</td>
+                <td style="width:150px" class="text-center">{{ timer.details }}</td>
                 <td class="text-center">
-                    {% ifequal timer.fleet_type "Armor" %}
+                    {% ifequal timer.objective "Hostile" %}
                         <div class="label label-danger">
-                            Armor
+                            Hostile
                         </div>
                     {% endifequal %}
-                    {% ifequal timer.fleet_type "Shield" %}
+                    {% ifequal timer.objective "Friendly" %}
                         <div class="label label-primary">
-                            Shield
+                            Friendly
                         </div>
                     {% endifequal %}
-                    {% ifequal timer.fleet_type "Other" %}
+                    {% ifequal timer.objective "Neutral" %}
                         <div class="label label-default">
-                            Other
+                            Neutral
                         </div>
                     {% endifequal %}
                 </td>
diff --git a/timerboard/form.py b/timerboard/form.py
index eebe0d4c..09653b96 100755
--- a/timerboard/form.py
+++ b/timerboard/form.py
@@ -6,13 +6,13 @@ from django.core.validators import MaxValueValidator, MinValueValidator
 class TimerForm(forms.Form):
     structure_choices = [('POCO', 'POCO'), ('I-HUB', 'I-HUB'), ('POS[S]', 'POS[S]'),
                          ('POS[M]', 'POS[M]'), ('POS[L]', 'POS[L]'), ('Station', 'Station'), ('Other', 'Other')]
-    fleet_type_choices = [('Armor', 'Armor'), ('Shield', 'Shield'), ('Other', 'Other')]
+    objective_choices = [('Friendly', 'Friendly'), ('Hostile', 'Hostile'), ('Neutral', 'Neutral')]
 
-    name = forms.CharField(max_length=254, required=True, label='Fleet Name')
+    details = forms.CharField(max_length=254, required=True, label='Details')
     system = forms.CharField(max_length=254, required=True, label="System")
     planet_moon = forms.CharField(max_length=254, label="Planet/Moon", required=False, initial="")
     structure = forms.ChoiceField(choices=structure_choices, required=True, label="Structure Type")
-    fleet_type = forms.ChoiceField(choices=fleet_type_choices, required=True, label="Fleet Type")
+    objective = forms.ChoiceField(choices=objective_choices, required=True, label="Objective")
     days_left = forms.IntegerField(required=True, label="Days Remaining", validators=[MinValueValidator(0)])
     hours_left = forms.IntegerField(required=True, label="Hours Remaining", validators=[MinValueValidator(0), MaxValueValidator(23)])
     minutes_left = forms.IntegerField(required=True, label="Minutes Remaining", validators=[MinValueValidator(0), MaxValueValidator(59)])
diff --git a/timerboard/models.py b/timerboard/models.py
index 3052345b..c4ba7d96 100755
--- a/timerboard/models.py
+++ b/timerboard/models.py
@@ -8,11 +8,11 @@ from eveonline.models import EveCorporationInfo
 class Timer(models.Model):
     class Meta:
         ordering = ['eve_time']
-    name = models.CharField(max_length=254, default="")
+    details = models.CharField(max_length=254, default="")
     system = models.CharField(max_length=254, default="")
     planet_moon = models.CharField(max_length=254, default="")
     structure = models.CharField(max_length=254, default="")
-    fleet_type = models.CharField(max_length=254, default="")
+    objective = models.CharField(max_length=254, default="")
     eve_time = models.DateTimeField()
     important = models.BooleanField(default=False)
     eve_character = models.ForeignKey(EveCharacter)
diff --git a/timerboard/views.py b/timerboard/views.py
index 25603d17..51296cf4 100755
--- a/timerboard/views.py
+++ b/timerboard/views.py
@@ -54,11 +54,11 @@ def add_timer_view(request):
 
             # handle valid form
             timer = Timer()
-            timer.name = form.cleaned_data['name']
+            timer.details = form.cleaned_data['details']
             timer.system = form.cleaned_data['system']
             timer.planet_moon = form.cleaned_data['planet_moon']
             timer.structure = form.cleaned_data['structure']
-            timer.fleet_type = form.cleaned_data['fleet_type']
+            timer.objective = form.cleaned_data['objective']
             timer.eve_time = eve_time
             timer.important = form.cleaned_data['important']
             timer.eve_character = character