diff --git a/.travis.yml b/.travis.yml
index 9afa017..f1b9af4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,9 @@ language: rust
 sudo: false
 
 cache:
-  - cargo
+  # Cache ONLY .cargo, not target/ like usual
+  directories:
+  - $HOME/.cargo
 
 rust:
   - nightly
@@ -17,8 +19,6 @@ before_script:
   - cargo install-update -a
 
 script:
-  # Travis seems to cache for some dumb reason, but we don't want that at all.
-  - rm -fr target
   # Obtain the devkitPro tools, using `target/` as a temp directory
   - mkdir -p target
   - cd target
diff --git a/src/video/tiled.rs b/src/video/tiled.rs
index e91dcc1..40bb383 100644
--- a/src/video/tiled.rs
+++ b/src/video/tiled.rs
@@ -59,25 +59,25 @@ newtype! {
 newtype! {
   /// A screenblock for use in Affine mode.
   #[derive(Clone, Copy)]
-  AffineScreenblock_16x16, [AffineScreenblockEntry; 16*16], no frills
+  AffineScreenblock16x16, [AffineScreenblockEntry; 16*16], no frills
 }
 
 newtype! {
   /// A screenblock for use in Affine mode.
   #[derive(Clone, Copy)]
-  AffineScreenblock_32x32, [AffineScreenblockEntry; 32*32], no frills
+  AffineScreenblock32x32, [AffineScreenblockEntry; 32*32], no frills
 }
 
 newtype! {
   /// A screenblock for use in Affine mode.
   #[derive(Clone, Copy)]
-  AffineScreenblock_64x64, [AffineScreenblockEntry; 64*64], no frills
+  AffineScreenblock64x64, [AffineScreenblockEntry; 64*64], no frills
 }
 
 newtype! {
   /// A screenblock for use in Affine mode.
   #[derive(Clone, Copy)]
-  AffineScreenblock_128x128, [AffineScreenblockEntry; 128*128], no frills
+  AffineScreenblock128x128, [AffineScreenblockEntry; 128*128], no frills
 }
 
 pub const VRAM_CHARBLOCKS: VolAddressBlock<Charblock4bpp> = unsafe { VolAddressBlock::new_unchecked(VolAddress::new_unchecked(VRAM_BASE_USIZE), 6) };