rename some methods

12 files changed, 181 insertions, 181 deletions

diff --git a/tests/basic.rs b/tests/basic.rs
index 071bdd3..b260a23 100644
--- a/tests/basic.rs
+++ b/tests/basic.rs
@@ -1,7 +1,7 @@
 #[test]
 fn object_creation() {
     let screen = vt100::Screen::new(24, 80);
-    assert_eq!(screen.window_size(), (24, 80));
+    assert_eq!(screen.size(), (24, 80));
 }
 
 #[test]
@@ -9,40 +9,40 @@ fn process_text() {
     let mut screen = vt100::Screen::new(24, 80);
     let input = b"foo\x1b[31m\x1b[32mb\x1b[3;7;42ma\x1b[23mr";
     screen.process(input);
-    assert_eq!(screen.window_contents(0, 0, 0, 50), "foobar\n");
+    assert_eq!(screen.contents(0, 0, 0, 50), "foobar\n");
 }
 
 #[test]
-fn set_window_size() {
+fn set_size() {
     let mut screen = vt100::Screen::new(24, 80);
-    assert_eq!(screen.window_size(), (24, 80));
+    assert_eq!(screen.size(), (24, 80));
     assert_eq!(screen.cursor_position(), (0, 0));
 
-    screen.set_window_size(34, 8);
-    assert_eq!(screen.window_size(), (34, 8));
+    screen.set_size(34, 8);
+    assert_eq!(screen.size(), (34, 8));
     assert_eq!(screen.cursor_position(), (0, 0));
 
     screen.process(b"\x1b[30;5H");
     assert_eq!(screen.cursor_position(), (29, 4));
 
-    screen.set_window_size(24, 80);
-    assert_eq!(screen.window_size(), (24, 80));
+    screen.set_size(24, 80);
+    assert_eq!(screen.size(), (24, 80));
     assert_eq!(screen.cursor_position(), (23, 4));
 
-    screen.set_window_size(34, 8);
-    assert_eq!(screen.window_size(), (34, 8));
+    screen.set_size(34, 8);
+    assert_eq!(screen.size(), (34, 8));
     assert_eq!(screen.cursor_position(), (23, 4));
 
     screen.process(b"\x1b[?1049h");
-    assert_eq!(screen.window_size(), (34, 8));
+    assert_eq!(screen.size(), (34, 8));
     assert_eq!(screen.cursor_position(), (0, 0));
 
-    screen.set_window_size(24, 80);
-    assert_eq!(screen.window_size(), (24, 80));
+    screen.set_size(24, 80);
+    assert_eq!(screen.size(), (24, 80));
     assert_eq!(screen.cursor_position(), (0, 0));
 
     screen.process(b"\x1b[?1049l");
-    assert_eq!(screen.window_size(), (24, 80));
+    assert_eq!(screen.size(), (24, 80));
     assert_eq!(screen.cursor_position(), (23, 4));
 }
 
diff --git a/tests/control.rs b/tests/control.rs
index accc17e..7e45add 100644
--- a/tests/control.rs
+++ b/tests/control.rs
@@ -20,7 +20,7 @@ fn bs() {
     assert_eq!(screen.cell(0, 3).unwrap().contents(), "");
     assert_eq!(screen.cell(1, 0).unwrap().contents(), "");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "faa\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
@@ -32,7 +32,7 @@ fn bs() {
     assert_eq!(screen.cell(1, 4).unwrap().contents(), "");
     assert_eq!(screen.cell(2, 0).unwrap().contents(), "");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "faa\nbarx\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 }
@@ -55,7 +55,7 @@ fn tab() {
     assert_eq!(screen.cell(0, 10).unwrap().contents(), "r");
     assert_eq!(screen.cell(0, 11).unwrap().contents(), "");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "foo     bar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 }
@@ -78,7 +78,7 @@ fn lf_with(b: u8) {
     assert_eq!(screen.cell(1, 5).unwrap().contents(), "r");
     assert_eq!(screen.cell(1, 6).unwrap().contents(), "");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "foo\n   bar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 }
@@ -110,7 +110,7 @@ fn cr() {
     assert_eq!(screen.cell(0, 4).unwrap().contents(), "");
     assert_eq!(screen.cell(1, 0).unwrap().contents(), "");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "baro\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 }
diff --git a/tests/csi.rs b/tests/csi.rs
index 5dcd88c..5177100 100644
--- a/tests/csi.rs
+++ b/tests/csi.rs
@@ -92,142 +92,142 @@ fn relative_movement() {
 fn ed() {
     let mut screen = vt100::Screen::new(24, 80);
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
     screen.process(b"foo\x1b[5;5Hbar\x1b[10;10Hbaz\x1b[20;20Hquux");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         baz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         baz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
 
     screen.process(b"\x1b[10;12H\x1b[0J");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
 
     screen.process(b"\x1b[5;6H\x1b[1J");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n      r\n\n\n\n\n         ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
     screen.process(b"\x1b[7;7H\x1b[2J");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
     screen.process(b"\x1b[2J\x1b[H");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
     screen.process(b"foo\x1b[5;5Hbar\x1b[10;10Hbaz\x1b[20;20Hquux");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         baz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         baz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
 
     screen.process(b"\x1b[10;12H\x1b[J");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
 
     screen.process(b"\x1b[2J\x1b[H");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
     screen.process(b"foo\x1b[5;5Hbar\x1b[10;10Hbaz\x1b[20;20Hquux");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         baz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         baz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
 
     screen.process(b"\x1b[10;12H\x1b[?0J");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
 
     screen.process(b"\x1b[5;6H\x1b[?1J");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n      r\n\n\n\n\n         ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
     screen.process(b"\x1b[7;7H\x1b[?2J");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
     screen.process(b"\x1b[2J\x1b[H");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
     screen.process(b"foo\x1b[5;5Hbar\x1b[10;10Hbaz\x1b[20;20Hquux");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         baz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         baz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
 
     screen.process(b"\x1b[10;12H\x1b[?J");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
 }
 
 #[test]
 fn el() {
     let mut screen = vt100::Screen::new(24, 80);
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
     screen.process(b"foo\x1b[5;5Hbarbar\x1b[10;10Hbazbaz\x1b[20;20Hquux");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n    barbar\n\n\n\n\n         bazbaz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n    barbar\n\n\n\n\n         bazbaz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
 
     screen.process(b"\x1b[5;8H\x1b[0K");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         bazbaz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         bazbaz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
 
     screen.process(b"\x1b[10;12H\x1b[1K");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n            baz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n            baz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
 
     screen.process(b"\x1b[20;22H\x1b[2K");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n            baz\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n            baz\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
 
     screen.process(b"\x1b[1;2H\x1b[K");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "f\n\n\n\n    bar\n\n\n\n\n            baz\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "f\n\n\n\n    bar\n\n\n\n\n            baz\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
 
     screen.process(b"\x1b[2J\x1b[H");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
     screen.process(b"foo\x1b[5;5Hbarbar\x1b[10;10Hbazbaz\x1b[20;20Hquux");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n    barbar\n\n\n\n\n         bazbaz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n    barbar\n\n\n\n\n         bazbaz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
 
     screen.process(b"\x1b[5;8H\x1b[?0K");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         bazbaz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n         bazbaz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
 
     screen.process(b"\x1b[10;12H\x1b[?1K");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n            baz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n            baz\n\n\n\n\n\n\n\n\n\n                   quux\n\n\n\n\n");
 
     screen.process(b"\x1b[20;22H\x1b[?2K");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n            baz\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n    bar\n\n\n\n\n            baz\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
 
     screen.process(b"\x1b[1;2H\x1b[?K");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "f\n\n\n\n    bar\n\n\n\n\n            baz\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "f\n\n\n\n    bar\n\n\n\n\n            baz\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
 
     screen.process(b"\x1b[2J\x1b[H");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
     screen.process(b"1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
     screen.process(b"\x1b[1;21H\x1b[K");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "12345678901234567890\n12345678901234567890\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
     screen.process(b"\x1b[1;10H\x1b[1K");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "          1234567890\n12345678901234567890\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 }
@@ -236,75 +236,75 @@ fn el() {
 fn ich_dch_ech() {
     let mut screen = vt100::Screen::new(24, 80);
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
     screen.process(b"\x1b[10;10Hfoobar");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n         foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
     screen.process(b"\x1b[10;12H\x1b[3@");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n         fo   obar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (9, 11));
 
     screen.process(b"\x1b[4P");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n         fobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (9, 11));
 
     screen.process(b"\x1b[100@");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n         fo\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (9, 11));
 
     screen.process(b"obar");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n         foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (9, 15));
 
     screen.process(b"\x1b[10;12H\x1b[100P");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n         fo\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (9, 11));
 
     screen.process(b"obar");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n         foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (9, 15));
 
     screen.process(b"\x1b[10;13H\x1b[X");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n         foo ar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (9, 12));
 
     screen.process(b"\x1b[10;11H\x1b[4X");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n         f    r\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (9, 10));
 
     screen.process(b"\x1b[10;11H\x1b[400X");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n         f\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (9, 10));
@@ -314,62 +314,62 @@ fn ich_dch_ech() {
 fn il_dl() {
     let mut screen = vt100::Screen::new(24, 80);
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
     screen.process(b"\x1b[10;10Hfoobar\x1b[3D");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n         foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (9, 12));
 
     screen.process(b"\x1b[L");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n         foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (9, 12));
 
     screen.process(b"\x1b[3L");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n         foobar\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (9, 12));
 
     screen.process(b"\x1b[500L");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (9, 12));
 
     screen.process(b"\x1b[10;10Hfoobar\x1b[3D\x1b[6A");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n         foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (3, 12));
 
     screen.process(b"\x1b[M");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n         foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (3, 12));
 
     screen.process(b"\x1b[3M");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n         foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (3, 12));
 
     screen.process(b"\x1b[500M");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (3, 12));
@@ -379,29 +379,29 @@ fn il_dl() {
 fn scroll() {
     let mut screen = vt100::Screen::new(24, 80);
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
     screen.process(b"1\r\n2\r\n3\r\n4\r\n5\r\n6\r\n7\r\n8\r\n9\r\n10\r\n11\r\n12\r\n13\r\n14\r\n15\r\n16\r\n17\r\n18\r\n19\r\n20\r\n21\r\n22\r\n23\r\n24");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n");
 
     screen.process(b"\x1b[15;15H");
     assert_eq!(screen.cursor_position(), (14, 14));
 
     screen.process(b"\x1b[S");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n");
     assert_eq!(screen.cursor_position(), (14, 14));
 
     screen.process(b"\x1b[3S");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n\n\n\n");
     assert_eq!(screen.cursor_position(), (14, 14));
 
     screen.process(b"\x1b[T");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n\n\n");
     assert_eq!(screen.cursor_position(), (14, 14));
 
     screen.process(b"\x1b[5T");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "\n\n\n\n\n\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n");
     assert_eq!(screen.cursor_position(), (14, 14));
 }
diff --git a/tests/escape.rs b/tests/escape.rs
index 999074c..d3eda71 100644
--- a/tests/escape.rs
+++ b/tests/escape.rs
@@ -15,7 +15,7 @@ fn ri() {
     let mut screen = vt100::Screen::new(24, 80);
     screen.process(b"foo\nbar\x1bMbaz");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "foo   baz\n   bar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 }
@@ -29,11 +29,11 @@ fn ris() {
     assert_eq!(cell.contents(), "");
 
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(
-        screen.window_contents_formatted(0, 0, 23, 79),
+        screen.contents_formatted(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
@@ -68,10 +68,10 @@ fn ris() {
     assert_eq!(cell.contents(), "f");
 
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "foo\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
-    assert_eq!(screen.window_contents_formatted(0, 0, 23, 79), "f\x1b[31;47;1;3;4moo\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents_formatted(0, 0, 23, 79), "f\x1b[31;47;1;3;4moo\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
 
     assert_eq!(screen.title(), "window title");
     assert_eq!(screen.icon_name(), "window icon name");
@@ -106,11 +106,11 @@ fn ris() {
     assert_eq!(cell.contents(), "");
 
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(
-        screen.window_contents_formatted(0, 0, 23, 79),
+        screen.contents_formatted(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
@@ -153,7 +153,7 @@ fn decsc() {
     let mut screen = vt100::Screen::new(24, 80);
     screen.process(b"foo\x1b7\r\n\r\n\r\n         bar\x1b8baz");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "foobaz\n\n\n         bar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 }
diff --git a/tests/init.rs b/tests/init.rs
index ab56278..4893f4a 100644
--- a/tests/init.rs
+++ b/tests/init.rs
@@ -3,7 +3,7 @@
 #[test]
 fn init() {
     let mut screen = vt100::Screen::new(24, 80);
-    assert_eq!(screen.window_size(), (24, 80));
+    assert_eq!(screen.size(), (24, 80));
     assert_eq!(screen.cursor_position(), (0, 0));
 
     let cell = screen.cell(0, 0);
@@ -16,11 +16,11 @@ fn init() {
     assert!(cell.is_none());
 
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(
-        screen.window_contents_formatted(0, 0, 23, 79),
+        screen.contents_formatted(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
diff --git a/tests/mode.rs b/tests/mode.rs
index 2e10fee..be6ad6d 100644
--- a/tests/mode.rs
+++ b/tests/mode.rs
@@ -304,20 +304,20 @@ fn alternate_buffer() {
 
     screen.process(b"\x1bc");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (0, 0));
     assert!(!screen.alternate_screen());
 
     screen.process(b"\x1b[m\x1b[2J\x1b[H1\r\n2\r\n3\r\n4\r\n5\r\n6\r\n7\r\n8\r\n9\r\n10\r\n11\r\n12\r\n13\r\n14\r\n15\r\n16\r\n17\r\n18\r\n19\r\n20\r\n21\r\n22\r\n23\r\n24");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n");
     assert_eq!(screen.cursor_position(), (23, 2));
     assert!(!screen.alternate_screen());
 
     screen.process(b"\x1b[?47h");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (0, 0));
@@ -325,27 +325,27 @@ fn alternate_buffer() {
 
     screen.process(b"foobar");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (0, 6));
     assert!(screen.alternate_screen());
 
     screen.process(b"\x1b[?47l");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n");
     assert_eq!(screen.cursor_position(), (23, 2));
     assert!(!screen.alternate_screen());
 
     screen.process(b"\x1b[?47h");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (0, 6));
     assert!(screen.alternate_screen());
 
     screen.process(b"\x1b[?47l");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n");
     assert_eq!(screen.cursor_position(), (23, 2));
     assert!(!screen.alternate_screen());
 
@@ -353,20 +353,20 @@ fn alternate_buffer() {
 
     screen.process(b"\x1bc");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (0, 0));
     assert!(!screen.alternate_screen());
 
     screen.process(b"\x1b[m\x1b[2J\x1b[H1\r\n2\r\n3\r\n4\r\n5\r\n6\r\n7\r\n8\r\n9\r\n10\r\n11\r\n12\r\n13\r\n14\r\n15\r\n16\r\n17\r\n18\r\n19\r\n20\r\n21\r\n22\r\n23\r\n24");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n");
     assert_eq!(screen.cursor_position(), (23, 2));
     assert!(!screen.alternate_screen());
 
     screen.process(b"\x1b[?1049h");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (0, 0));
@@ -374,27 +374,27 @@ fn alternate_buffer() {
 
     screen.process(b"foobar");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (0, 6));
     assert!(screen.alternate_screen());
 
     screen.process(b"\x1b[?1049l");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n");
     assert_eq!(screen.cursor_position(), (23, 2));
     assert!(!screen.alternate_screen());
 
     screen.process(b"\x1b[?1049h");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(screen.cursor_position(), (0, 0));
     assert!(screen.alternate_screen());
 
     screen.process(b"\x1b[?1049l");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n");
     assert_eq!(screen.cursor_position(), (23, 2));
     assert!(!screen.alternate_screen());
 }
diff --git a/tests/processing.rs b/tests/processing.rs
index 7ee651e..f390493 100644
--- a/tests/processing.rs
+++ b/tests/processing.rs
@@ -3,78 +3,78 @@
 #[test]
 fn split_escape_sequences() {
     let mut screen = vt100::Screen::new(24, 80);
-    let contents = screen.window_contents(0, 0, 23, 79);
+    let contents = screen.contents(0, 0, 23, 79);
     screen.process(b"abc");
-    assert_ne!(screen.window_contents(0, 0, 23, 79), contents);
-    let contents = screen.window_contents(0, 0, 23, 79);
+    assert_ne!(screen.contents(0, 0, 23, 79), contents);
+    let contents = screen.contents(0, 0, 23, 79);
     screen.process(b"abc\x1b[12;24Hdef");
-    assert_ne!(screen.window_contents(0, 0, 23, 79), contents);
-    let contents = screen.window_contents(0, 0, 23, 79);
+    assert_ne!(screen.contents(0, 0, 23, 79), contents);
+    let contents = screen.contents(0, 0, 23, 79);
     assert!(contents.contains("abc"));
     assert!(contents.contains("def"));
     assert_eq!(screen.cursor_position(), (11, 26));
 
     screen.process(b"\x1b");
     assert_eq!(screen.cursor_position(), (11, 26));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"[");
     assert_eq!(screen.cursor_position(), (11, 26));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"1");
     assert_eq!(screen.cursor_position(), (11, 26));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"2");
     assert_eq!(screen.cursor_position(), (11, 26));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b";");
     assert_eq!(screen.cursor_position(), (11, 26));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"2");
     assert_eq!(screen.cursor_position(), (11, 26));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"4");
     assert_eq!(screen.cursor_position(), (11, 26));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"H");
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
 
     assert_eq!(screen.mouse_protocol_mode(), vt100::MouseProtocolMode::None);
     screen.process(b"\x1b");
     assert_eq!(screen.mouse_protocol_mode(), vt100::MouseProtocolMode::None);
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"[");
     assert_eq!(screen.mouse_protocol_mode(), vt100::MouseProtocolMode::None);
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"?");
     assert_eq!(screen.mouse_protocol_mode(), vt100::MouseProtocolMode::None);
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"1");
     assert_eq!(screen.mouse_protocol_mode(), vt100::MouseProtocolMode::None);
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"0");
     assert_eq!(screen.mouse_protocol_mode(), vt100::MouseProtocolMode::None);
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"0");
     assert_eq!(screen.mouse_protocol_mode(), vt100::MouseProtocolMode::None);
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"0");
     assert_eq!(screen.mouse_protocol_mode(), vt100::MouseProtocolMode::None);
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"h");
     assert_eq!(
         screen.mouse_protocol_mode(),
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
 
     assert_eq!(screen.title(), "");
     screen.process(b"\x1b");
@@ -84,7 +84,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"]");
     assert_eq!(screen.title(), "");
     assert_eq!(
@@ -92,7 +92,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"0");
     assert_eq!(screen.title(), "");
     assert_eq!(
@@ -100,7 +100,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b";");
     assert_eq!(screen.title(), "");
     assert_eq!(
@@ -108,7 +108,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"a");
     assert_eq!(screen.title(), "");
     assert_eq!(
@@ -116,7 +116,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b" ");
     assert_eq!(screen.title(), "");
     assert_eq!(
@@ -124,7 +124,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"'");
     assert_eq!(screen.title(), "");
     assert_eq!(
@@ -132,7 +132,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"[");
     assert_eq!(screen.title(), "");
     assert_eq!(
@@ -140,7 +140,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"]");
     assert_eq!(screen.title(), "");
     assert_eq!(
@@ -148,7 +148,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"_");
     assert_eq!(screen.title(), "");
     assert_eq!(
@@ -156,7 +156,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"\x07");
     assert_eq!(screen.title(), "a '[]_");
     assert_eq!(
@@ -164,37 +164,37 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
 }
 
 #[test]
 fn split_utf8() {
     let mut screen = vt100::Screen::new(24, 80);
-    let contents = screen.window_contents(0, 0, 23, 79);
+    let contents = screen.contents(0, 0, 23, 79);
     screen.process(b"a");
-    assert_ne!(screen.window_contents(0, 0, 23, 79), contents);
-    let contents = screen.window_contents(0, 0, 23, 79);
+    assert_ne!(screen.contents(0, 0, 23, 79), contents);
+    let contents = screen.contents(0, 0, 23, 79);
 
     screen.process(b"\xc3");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"\xa1");
-    assert_ne!(screen.window_contents(0, 0, 23, 79), contents);
-    let contents = screen.window_contents(0, 0, 23, 79);
+    assert_ne!(screen.contents(0, 0, 23, 79), contents);
+    let contents = screen.contents(0, 0, 23, 79);
 
     screen.process(b"\xe3");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"\x82");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"\xad");
-    assert_ne!(screen.window_contents(0, 0, 23, 79), contents);
-    let contents = screen.window_contents(0, 0, 23, 79);
+    assert_ne!(screen.contents(0, 0, 23, 79), contents);
+    let contents = screen.contents(0, 0, 23, 79);
 
     screen.process(b"\xf0");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"\x9f");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"\x92");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"\xa9");
-    assert_ne!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_ne!(screen.contents(0, 0, 23, 79), contents);
 }
diff --git a/tests/scroll.rs b/tests/scroll.rs
index 82e10fa..6a4bd83 100644
--- a/tests/scroll.rs
+++ b/tests/scroll.rs
@@ -2,10 +2,10 @@
 fn scroll_regions() {
     let mut screen = vt100::Screen::new(24, 80);
     screen.process(b"\x1b[m\x1b[2J\x1b[H1\r\n2\r\n3\r\n4\r\n5\r\n6\r\n7\r\n8\r\n9\r\n10\r\n11\r\n12\r\n13\r\n14\r\n15\r\n16\r\n17\r\n18\r\n19\r\n20\r\n21\r\n22\r\n23\r\n24");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n");
 
     screen.process(b"\x1b[24;50H\n");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n");
 
     screen.process(b"\x1b[m\x1b[2J\x1b[H1\r\n2\r\n3\r\n4\r\n5\r\n6\r\n7\r\n8\r\n9\r\n10\r\n11\r\n12\r\n13\r\n14\r\n15\r\n16\r\n17\r\n18\r\n19\r\n20\r\n21\r\n22\r\n23\r\n24");
 
@@ -16,7 +16,7 @@ fn scroll_regions() {
     assert_eq!(screen.cursor_position(), (19, 49));
 
     screen.process(b"\n");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n\n21\n22\n23\n24\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n\n21\n22\n23\n24\n");
     assert_eq!(screen.cursor_position(), (19, 49));
 
     screen.process(b"\x1b[B");
@@ -26,9 +26,9 @@ fn scroll_regions() {
     assert_eq!(screen.cursor_position(), (9, 49));
     screen.process(b"\x1b[1;24r\x1b[m\x1b[2J\x1b[H1\r\n2\r\n3\r\n4\r\n5\r\n6\r\n7\r\n8\r\n9\r\n10\r\n11\r\n12\r\n13\r\n14\r\n15\r\n16\r\n17\r\n18\r\n19\r\n20\r\n21\r\n22\r\n23\r\n24");
     screen.process(b"\x1b[10;20r\x1b[15;50H\x1b[2L");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n\n\n15\n16\n17\n18\n21\n22\n23\n24\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n\n\n15\n16\n17\n18\n21\n22\n23\n24\n");
     screen.process(b"\x1b[10;50H\x1bM");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n\n10\n11\n12\n13\n14\n\n\n15\n16\n17\n21\n22\n23\n24\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n\n10\n11\n12\n13\n14\n\n\n15\n16\n17\n21\n22\n23\n24\n");
 }
 
 #[test]
diff --git a/tests/split-escapes.rs b/tests/split-escapes.rs
index b630144..89e7b2e 100644
--- a/tests/split-escapes.rs
+++ b/tests/split-escapes.rs
@@ -12,7 +12,7 @@ fn write_to_screen(chunks: &mut Vec<Vec<u8>>) -> String {
     for chunk in chunks.iter_mut() {
         screen.process(&chunk);
     }
-    screen.window_contents(0, 0, 36, 192)
+    screen.contents(0, 0, 36, 192)
 }
 
 fn test_splits(filename: &str) {
diff --git a/tests/text.rs b/tests/text.rs
index a328d52..ef945f4 100644
--- a/tests/text.rs
+++ b/tests/text.rs
@@ -10,11 +10,11 @@ fn ascii() {
     assert_eq!(screen.cell(0, 3).unwrap().contents(), "");
     assert_eq!(screen.cell(1, 0).unwrap().contents(), "");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "foo\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(
-        screen.window_contents(0, 0, 500, 500),
+        screen.contents(0, 0, 500, 500),
         "foo\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 }
@@ -30,11 +30,11 @@ fn utf8() {
     assert_eq!(screen.cell(0, 4).unwrap().contents(), "");
     assert_eq!(screen.cell(1, 0).unwrap().contents(), "");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "café\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(
-        screen.window_contents(0, 0, 500, 500),
+        screen.contents(0, 0, 500, 500),
         "café\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 }
@@ -55,11 +55,11 @@ fn newlines() {
     assert_eq!(screen.cell(0, 3).unwrap().contents(), "");
     assert_eq!(screen.cell(3, 0).unwrap().contents(), "");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "f\noo\nood\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(
-        screen.window_contents(0, 0, 500, 500),
+        screen.contents(0, 0, 500, 500),
         "f\noo\nood\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 }
@@ -77,11 +77,11 @@ fn wide() {
     assert_eq!(screen.cell(0, 6).unwrap().contents(), "");
     assert_eq!(screen.cell(1, 0).unwrap().contents(), "");
     assert_eq!(
-        screen.window_contents(0, 0, 23, 79),
+        screen.contents(0, 0, 23, 79),
         "aデbネ\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
     assert_eq!(
-        screen.window_contents(0, 0, 500, 500),
+        screen.contents(0, 0, 500, 500),
         "aデbネ\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 }
@@ -94,9 +94,9 @@ fn combining() {
     screen.process("\u{0301}".as_bytes());
     assert_eq!(screen.cell(0, 0).unwrap().contents(), "á");
     screen.process(b"\x1b[20;20Habcdefg");
-    assert_eq!(screen.window_contents(19, 19, 19, 26), "abcdefg\n");
+    assert_eq!(screen.contents(19, 19, 19, 26), "abcdefg\n");
     screen.process("\x1b[20;25H\u{0301}".as_bytes());
-    assert_eq!(screen.window_contents(19, 19, 19, 26), "abcdéfg\n");
+    assert_eq!(screen.contents(19, 19, 19, 26), "abcdéfg\n");
     screen.process(b"\x1b[10;78Haaa");
     assert_eq!(screen.cell(9, 79).unwrap().contents(), "a");
     screen.process("\r\n\u{0301}".as_bytes());
@@ -108,34 +108,34 @@ fn combining() {
 fn wrap() {
     let mut screen = vt100::Screen::new(24, 80);
     screen.process(b"0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
     screen.process(b"\x1b[5H01234567890123456789012345678901234567890123456789012345678901234567890123456789");
     screen.process(b"\x1b[6H01234567890123456789012345678901234567890123456789012345678901234567890123456789");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\n\n\n01234567890123456789012345678901234567890123456789012345678901234567890123456789\n01234567890123456789012345678901234567890123456789012345678901234567890123456789\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\n\n\n01234567890123456789012345678901234567890123456789012345678901234567890123456789\n01234567890123456789012345678901234567890123456789012345678901234567890123456789\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
 
     screen.process(b"\x1b[H\x1b[J");
     screen.process(b"0123456789012345678901234567890123456789012345678901234567890123456789012345678");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "0123456789012345678901234567890123456789012345678901234567890123456789012345678\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "0123456789012345678901234567890123456789012345678901234567890123456789012345678\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
     assert_eq!(screen.cursor_position(), (0, 79));
     screen.process(b"9");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "01234567890123456789012345678901234567890123456789012345678901234567890123456789\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "01234567890123456789012345678901234567890123456789012345678901234567890123456789\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
     assert_eq!(screen.cursor_position(), (0, 80));
     screen.process(b"a");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "01234567890123456789012345678901234567890123456789012345678901234567890123456789a\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "01234567890123456789012345678901234567890123456789012345678901234567890123456789a\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
     assert_eq!(screen.cursor_position(), (1, 1));
     screen.process(b"b");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "01234567890123456789012345678901234567890123456789012345678901234567890123456789ab\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "01234567890123456789012345678901234567890123456789012345678901234567890123456789ab\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
     assert_eq!(screen.cursor_position(), (1, 2));
 
     screen.process(b"\x1b[H\x1b[J");
     screen.process(b"012345678901234567890123456789012345678901234567890123456789012345678901234567");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "012345678901234567890123456789012345678901234567890123456789012345678901234567\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "012345678901234567890123456789012345678901234567890123456789012345678901234567\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
     assert_eq!(screen.cursor_position(), (0, 78));
     screen.process("ネ".as_bytes());
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "012345678901234567890123456789012345678901234567890123456789012345678901234567ネ\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "012345678901234567890123456789012345678901234567890123456789012345678901234567ネ\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
     assert_eq!(screen.cursor_position(), (0, 80));
     screen.process(b"a");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "012345678901234567890123456789012345678901234567890123456789012345678901234567ネa\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "012345678901234567890123456789012345678901234567890123456789012345678901234567ネa\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
     assert_eq!(screen.cursor_position(), (1, 1));
     assert_eq!(screen.cell(0, 77).unwrap().contents(), "7");
     assert_eq!(screen.cell(0, 78).unwrap().contents(), "ネ");
@@ -145,13 +145,13 @@ fn wrap() {
 
     screen.process(b"\x1b[H\x1b[J");
     screen.process(b"0123456789012345678901234567890123456789012345678901234567890123456789012345678");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "0123456789012345678901234567890123456789012345678901234567890123456789012345678\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "0123456789012345678901234567890123456789012345678901234567890123456789012345678\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
     assert_eq!(screen.cursor_position(), (0, 79));
     screen.process("ネ".as_bytes());
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "0123456789012345678901234567890123456789012345678901234567890123456789012345678ネ\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "0123456789012345678901234567890123456789012345678901234567890123456789012345678ネ\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
     assert_eq!(screen.cursor_position(), (1, 2));
     screen.process(b"a");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), "0123456789012345678901234567890123456789012345678901234567890123456789012345678ネa\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents(0, 0, 23, 79), "0123456789012345678901234567890123456789012345678901234567890123456789012345678ネa\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
     assert_eq!(screen.cursor_position(), (1, 3));
     assert_eq!(screen.cell(0, 77).unwrap().contents(), "7");
     assert_eq!(screen.cell(0, 78).unwrap().contents(), "8");
diff --git a/tests/window_contents.rs b/tests/window_contents.rs
index 91e73e3..ac2e2e8 100644
--- a/tests/window_contents.rs
+++ b/tests/window_contents.rs
@@ -2,7 +2,7 @@
 fn formatted() {
     let mut screen = vt100::Screen::new(24, 80);
     assert_eq!(
-        screen.window_contents_formatted(0, 0, 23, 79),
+        screen.contents_formatted(0, 0, 23, 79),
         "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
@@ -12,7 +12,7 @@ fn formatted() {
     assert!(!screen.cell(0, 4).unwrap().bold());
     assert!(!screen.cell(0, 5).unwrap().bold());
     assert_eq!(
-        screen.window_contents_formatted(0, 0, 23, 79),
+        screen.contents_formatted(0, 0, 23, 79),
         "foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     );
 
@@ -21,12 +21,12 @@ fn formatted() {
     assert!(screen.cell(0, 3).unwrap().bold());
     assert!(!screen.cell(0, 4).unwrap().bold());
     assert!(!screen.cell(0, 5).unwrap().bold());
-    assert_eq!(screen.window_contents_formatted(0, 0 ,23, 79), "foo\x1b[33;1;7mb\x1b[mar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents_formatted(0, 0 ,23, 79), "foo\x1b[33;1;7mb\x1b[mar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
 
     screen.process(b"\x1b[1;5H\x1b[22;42ma");
     assert!(!screen.cell(0, 2).unwrap().bold());
     assert!(screen.cell(0, 3).unwrap().bold());
     assert!(!screen.cell(0, 4).unwrap().bold());
     assert!(!screen.cell(0, 5).unwrap().bold());
-    assert_eq!(screen.window_contents_formatted(0, 0 ,23, 79), "foo\x1b[33;1;7mb\x1b[42;22ma\x1b[mr\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    assert_eq!(screen.contents_formatted(0, 0 ,23, 79), "foo\x1b[33;1;7mb\x1b[42;22ma\x1b[mr\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
 }
diff --git a/tests/zero-width.rs b/tests/zero-width.rs
index 0722b66..2b8c1a4 100644
--- a/tests/zero-width.rs
+++ b/tests/zero-width.rs
@@ -4,7 +4,7 @@
 fn zero_width_characters() {
     let mut screen = vt100::Screen::new(24, 140);
     screen.process(b"Free En\xc2\xadter\xc2\xadprise is gonna ru\xc2\xadin ev\xc2\xadery\xc2\xadthing good un\xc2\xadless we take a knife to its tes\xc2\xadti\xc2\xadcles first.");
-    assert_eq!(screen.window_contents(0, 0, 0, 139), "Free En\u{00ad}ter\u{00ad}prise is gonna ru\u{00ad}in ev\u{00ad}ery\u{00ad}thing good un\u{00ad}less we take a knife to its tes\u{00ad}ti\u{00ad}cles first.\n");
+    assert_eq!(screen.contents(0, 0, 0, 139), "Free En\u{00ad}ter\u{00ad}prise is gonna ru\u{00ad}in ev\u{00ad}ery\u{00ad}thing good un\u{00ad}less we take a knife to its tes\u{00ad}ti\u{00ad}cles first.\n");
     assert_eq!(screen.cell(0, 0).unwrap().contents(), "F");
     assert_eq!(screen.cell(0, 1).unwrap().contents(), "r");
     assert_eq!(screen.cell(0, 2).unwrap().contents(), "e");