diff --git a/src/app.rs b/src/app.rs
index 1205f5b..68928a8 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -58,11 +58,11 @@ pub struct App {
     tick_rate: f64,
     // App
     cur_mode: Mode,
-    disk_id_dest: Option<usize>,
-    disk_id_source: Option<usize>,
+    disk_index_dest: Option<usize>,
+    disk_index_source: Option<usize>,
     disk_list: Arc<Mutex<Vec<Disk>>>,
-    part_num_boot: Option<usize>,
-    part_num_os: Option<usize>,
+    part_index_boot: Option<usize>,
+    part_index_os: Option<usize>,
     driver: Option<Driver>,
     prev_mode: Mode,
     selections: Vec<Option<usize>>,
@@ -108,12 +108,12 @@ impl App {
             tick_rate,
             // App
             cur_mode: Mode::ScanDisks,
-            disk_id_dest: None,
-            disk_id_source: None,
+            disk_index_dest: None,
+            disk_index_source: None,
             disk_list: Arc::new(Mutex::new(Vec::new())),
             driver: None,
-            part_num_boot: None,
-            part_num_os: None,
+            part_index_boot: None,
+            part_index_os: None,
             prev_mode: Mode::ScanDisks,
             selections: vec![None, None],
             table_type: None,
@@ -321,12 +321,12 @@ impl App {
                 Action::Select(one, two) => {
                     match self.cur_mode {
                         Mode::SelectDisks => {
-                            self.disk_id_source = one.clone();
-                            self.disk_id_dest = two.clone();
+                            self.disk_index_source = one.clone();
+                            self.disk_index_dest = two.clone();
                         }
                         Mode::SelectParts => {
-                            self.part_num_boot = one.clone();
-                            self.part_num_os = two.clone();
+                            self.part_index_boot = one.clone();
+                            self.part_index_os = two.clone();
                         }
                         _ => {}
                     }
@@ -377,9 +377,9 @@ impl App {
                 }
                 Action::UpdateDestDisk => {
                     let disk_list_arc = Arc::clone(&self.disk_list);
-                    if let Some(dest_id_index) = self.disk_id_dest {
+                    if let Some(dest_index) = self.disk_index_dest {
                         self.task_handles
-                            .push(lazy_update_dest_disk(disk_list_arc, dest_id_index));
+                            .push(lazy_update_dest_disk(disk_list_arc, dest_index));
                     }
                 }
                 _ => {}