2 files changed, 13 insertions, 13 deletions

diff --git a/src/main.rs b/src/main.rs
index 70bc0b4..ae84e0b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -158,7 +158,7 @@ impl Ivy {
     let buffer = self.buffer.read().await;
     let scroll_top = *window.scroll_top.read().await;
 
-    terminal.do_cursor_position(0, range.start).await?;
+    terminal.set_cursor_position(0, range.start).await?;
 
     let mut screen_y = range.start;
     for i in range.clone() {
@@ -186,7 +186,7 @@ impl Ivy {
     let mut terminal = self.terminal.write().await;
     let height = *terminal.height.read().await;
 
-    terminal.do_cursor_position(0, height).await?;
+    terminal.set_cursor_position(0, height).await?;
     terminal.stdout.write_all("        status goes here".as_bytes()).await?;
 
     Ok(())
@@ -195,7 +195,7 @@ impl Ivy {
   async fn fix_cursor_position(&mut self) -> Result<()> {
     let mut terminal = self.terminal.write().await;
     let window = self.window.read().await;
-    terminal.do_cursor_position(*window.cursor_column.read().await,
+    terminal.set_cursor_position(*window.cursor_column.read().await,
                                 *window.cursor_row.read().await
                                 - *window.scroll_top.read().await).await?;
 
@@ -411,7 +411,7 @@ impl Ivy {
         let mut terminal = self.terminal.write().await;
         let scroll_top = *window.scroll_top.read().await;
 
-        terminal.do_cursor_position(column, row - scroll_top).await?;
+        terminal.set_cursor_position(column, row - scroll_top).await?;
         terminal.stdout.flush().await?;
       }
     }
diff --git a/src/terminal.rs b/src/terminal.rs
index 300fcfb..d6cfc69 100644
--- a/src/terminal.rs
+++ b/src/terminal.rs
@@ -74,10 +74,10 @@ impl Terminal {
   }
 
   pub async fn init_full_screen(&mut self) -> Result<()> {
-    self.do_start_alternate_screen().await?;
-    self.do_cursor_position(0, 0).await?;
+    self.start_alternate_screen().await?;
+    self.set_cursor_position(0, 0).await?;
 
-    let (width, height) = self.do_report_size().await?;
+    let (width, height) = self.report_size().await?;
     *self.width.write().await = width.try_into().unwrap();
     *self.height.write().await = height.try_into().unwrap();
 
@@ -87,13 +87,13 @@ impl Terminal {
   }
 
   pub async fn zap_full_screen(&mut self) -> Result<()> {
-    let (width, height) = self.do_report_size().await?;
+    let (width, height) = self.report_size().await?;
     *self.width.write().await = width.try_into().unwrap();
     *self.height.write().await = height.try_into().unwrap();
 
     self.set_scroll_region(0, height).await?;
 
-    self.do_end_alternate_screen().await?;
+    self.end_alternate_screen().await?;
     self.stdout.flush().await?;
 
     Ok(())
@@ -190,24 +190,24 @@ impl Terminal {
   }
 
   // xterm
-  pub async fn do_start_alternate_screen(&mut self) -> Result<()> {
+  pub async fn start_alternate_screen(&mut self) -> Result<()> {
     self.do_escape(EscapeType::CSIPrivate, "h", &[1049]).await
   }
 
   // xterm
-  pub async fn do_end_alternate_screen(&mut self) -> Result<()> {
+  pub async fn end_alternate_screen(&mut self) -> Result<()> {
     self.do_escape(EscapeType::CSIPrivate, "l", &[1049]).await
   }
 
   // vt220? vt100?
-  pub async fn do_cursor_position(&mut self, x: usize, y: usize)
+  pub async fn set_cursor_position(&mut self, x: usize, y: usize)
       -> Result<()>
   {
     self.do_escape(EscapeType::CSI, "H", &[y + 1, x + 1]).await
   }
 
   // dtterm? xterm
-  pub async fn do_report_size(&mut self) -> Result<(usize, usize)> {
+  pub async fn report_size(&mut self) -> Result<(usize, usize)> {
     self.do_escape(EscapeType::CSI, "t", &[18]).await?;
     self.stdout.flush().await?;
     let (code, values) = self.read_report(EscapeType::CSI).await?;