diff --git a/simpleskycam.ui b/simpleskycam.ui
index 49b6574..60aebc4 100644
--- a/simpleskycam.ui
+++ b/simpleskycam.ui
@@ -811,7 +811,7 @@
                 <property name="row-spacing">4</property>
                 <property name="column-spacing">4</property>
                 <child>
-                  <object class="GtkEntry" id="posctl_entry_a1angle">
+                  <object class="GtkEntry" id="posctl_entry_ra_angle">
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can-focus">True</property>
@@ -841,7 +841,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEntry" id="posctl_entry_a2angle">
+                  <object class="GtkEntry" id="posctl_entry_dec_angle">
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can-focus">True</property>
@@ -928,7 +928,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEntry" id="posctl_entry_a1len">
+                  <object class="GtkEntry" id="posctl_entry_ra_len">
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can-focus">True</property>
@@ -943,7 +943,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEntry" id="posctl_entry_a2len">
+                  <object class="GtkEntry" id="posctl_entry_dec_len">
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can-focus">True</property>
@@ -1048,8 +1048,8 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkRadioButton" id="cal_mode_a1s">
-                    <property name="label" translatable="yes">A1S</property>
+                  <object class="GtkRadioButton" id="cal_mode_ra_s">
+                    <property name="label" translatable="yes">RAS</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can-focus">False</property>
@@ -1064,8 +1064,8 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkRadioButton" id="cal_mode_a1">
-                    <property name="label" translatable="yes">A1</property>
+                  <object class="GtkRadioButton" id="cal_mode_ra">
+                    <property name="label" translatable="yes">RA</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can-focus">False</property>
@@ -1080,8 +1080,8 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkRadioButton" id="cal_mode_a2s">
-                    <property name="label" translatable="yes">A2S</property>
+                  <object class="GtkRadioButton" id="cal_mode_dec_s">
+                    <property name="label" translatable="yes">DECS</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can-focus">False</property>
@@ -1097,8 +1097,8 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkRadioButton" id="cal_mode_a2">
-                    <property name="label" translatable="yes">A2</property>
+                  <object class="GtkRadioButton" id="cal_mode_dec">
+                    <property name="label" translatable="yes">DEC</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can-focus">False</property>
@@ -1290,7 +1290,7 @@
                                 <property name="can-focus">False</property>
                                 <property name="spacing">4</property>
                                 <child>
-                                  <object class="GtkDrawingArea" id="posctl_da_axis1">
+                                  <object class="GtkDrawingArea" id="posctl_da_ra">
                                     <property name="width-request">100</property>
                                     <property name="height-request">150</property>
                                     <property name="visible">True</property>
@@ -1549,7 +1549,7 @@
                                 <property name="can-focus">False</property>
                                 <property name="spacing">4</property>
                                 <child>
-                                  <object class="GtkDrawingArea" id="posctl_da_axis2">
+                                  <object class="GtkDrawingArea" id="posctl_da_dec">
                                     <property name="width-request">100</property>
                                     <property name="height-request">150</property>
                                     <property name="visible">True</property>