diff --git a/data/Makefile.am b/data/Makefile.am
index 4330dcb..0881abb 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,14 +1,14 @@
 NULL = 
 EXTRA_DIST = \
-	foo_fighter \
-	bar_fighter \
-	bar_boss \
-	baz_fighter \
-	explosion_medium \
-	explosion_small \
-	item_gem \
-	item_heart \
-	ship_green \
-	weapon_bomb \
-	weapon_fragbomb \
+	barboss.txt \
+	barfight.txt \
+	bazfight.txt \
+	bongem.txt \
+	bonheart.txt \
+	foofight.txt \
+	ship.txt \
+	wpnbomb.txt \
+	wpnfrag.txt \
+	xplmed.txt \
+	xplsmall.txt \
 	$(NULL)
diff --git a/data/bar_boss b/data/barboss.txt
similarity index 100%
rename from data/bar_boss
rename to data/barboss.txt
diff --git a/data/bar_fighter b/data/barfight.txt
similarity index 100%
rename from data/bar_fighter
rename to data/barfight.txt
diff --git a/data/baz_fighter b/data/bazfight.txt
similarity index 100%
rename from data/baz_fighter
rename to data/bazfight.txt
diff --git a/data/item_gem b/data/bongem.txt
similarity index 100%
rename from data/item_gem
rename to data/bongem.txt
diff --git a/data/item_heart b/data/bonheart.txt
similarity index 100%
rename from data/item_heart
rename to data/bonheart.txt
diff --git a/data/foo_fighter b/data/foofight.txt
similarity index 100%
rename from data/foo_fighter
rename to data/foofight.txt
diff --git a/data/ship_green b/data/ship.txt
similarity index 100%
rename from data/ship_green
rename to data/ship.txt
diff --git a/data/weapon_bomb b/data/wpnbomb.txt
similarity index 100%
rename from data/weapon_bomb
rename to data/wpnbomb.txt
diff --git a/data/weapon_fragbomb b/data/wpnfrag.txt
similarity index 100%
rename from data/weapon_fragbomb
rename to data/wpnfrag.txt
diff --git a/data/explosion_medium b/data/xplmed.txt
similarity index 100%
rename from data/explosion_medium
rename to data/xplmed.txt
diff --git a/data/explosion_small b/data/xplsmall.txt
similarity index 100%
rename from data/explosion_small
rename to data/xplsmall.txt
diff --git a/src/aliens.c b/src/aliens.c
index 6292796..636dee3 100644
--- a/src/aliens.c
+++ b/src/aliens.c
@@ -39,9 +39,9 @@ void init_aliens(game *g, aliens *al)
         al->type[i] = ALIEN_NONE;
     }
 
-    foo_sprite = ee_load_sprite("data/foo_fighter");
-    bar_sprite = ee_load_sprite("data/bar_fighter");
-    baz_sprite = ee_load_sprite("data/baz_fighter");
+    foo_sprite = ee_load_sprite("data/foofight.txt");
+    bar_sprite = ee_load_sprite("data/barfight.txt");
+    baz_sprite = ee_load_sprite("data/bazfight.txt");
 }
 
 void draw_aliens(game *g, aliens *al)
diff --git a/src/bonus.c b/src/bonus.c
index 8b9b6c2..f0201c3 100644
--- a/src/bonus.c
+++ b/src/bonus.c
@@ -38,8 +38,8 @@ void init_bonus(game *g, bonus *bo)
         bo->type[i] = BONUS_NONE;
     }
 
-    heart_sprite = ee_load_sprite("data/heart");
-    gem_sprite = ee_load_sprite("data/gem");
+    heart_sprite = ee_load_sprite("data/bonheart.txt");
+    gem_sprite = ee_load_sprite("data/bongem.txt");
 }
 
 void draw_bonus(game *g, bonus *bo)
diff --git a/src/explosions.c b/src/explosions.c
index 09c5af7..9ea020a 100644
--- a/src/explosions.c
+++ b/src/explosions.c
@@ -38,8 +38,8 @@ void init_explosions(game *g, explosions *ex)
         ex->type[i] = EXPLOSION_NONE;
     }
 
-    medium_sprite = ee_load_sprite("data/explosion_medium");
-    small_sprite = ee_load_sprite("data/explosion_small");
+    medium_sprite = ee_load_sprite("data/xplmed.txt");
+    small_sprite = ee_load_sprite("data/xplsmall.txt");
 }
 
 void add_explosion(game *g, explosions *ex, int x, int y, int vx, int vy, int type)
diff --git a/src/intro.c b/src/intro.c
index 9beb148..acba794 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -30,9 +30,9 @@
 
 void intro(void)
 {
-    struct ee_sprite *foo_sprite = ee_load_sprite("data/foo_fighter");
-    struct ee_sprite *bar_sprite = ee_load_sprite("data/bar_fighter");
-    struct ee_sprite *baz_sprite = ee_load_sprite("data/baz_fighter");
+    struct ee_sprite *foo_sprite = ee_load_sprite("data/foofight.txt");
+    struct ee_sprite *bar_sprite = ee_load_sprite("data/barfight.txt");
+    struct ee_sprite *baz_sprite = ee_load_sprite("data/bazfight.txt");
 
     int frame = 0;
 
diff --git a/src/player.c b/src/player.c
index 948feef..0daac48 100644
--- a/src/player.c
+++ b/src/player.c
@@ -42,7 +42,7 @@ player * create_player(game *g)
     p->life = MAX_LIFE;
     p->dead = 0;
 
-    ship_sprite = ee_load_sprite("data/ship_green");
+    ship_sprite = ee_load_sprite("data/ship.txt");
 
     return p;
 }
diff --git a/src/weapons.c b/src/weapons.c
index ea1ffe3..6420246 100644
--- a/src/weapons.c
+++ b/src/weapons.c
@@ -43,8 +43,8 @@ void init_weapons(game *g, weapons *wp)
         wp->type[i] = WEAPON_NONE;
     }
 
-    bomb_sprite = ee_load_sprite("data/weapon_bomb");
-    fragbomb_sprite = ee_load_sprite("data/weapon_fragbomb");
+    bomb_sprite = ee_load_sprite("data/wpnbomb.txt");
+    fragbomb_sprite = ee_load_sprite("data/wpnfrag.txt");
 }
 
 void draw_weapons(game *g, weapons *wp)
diff --git a/test/demo.c b/test/demo.c
index 7e81161..1f2f980 100644
--- a/test/demo.c
+++ b/test/demo.c
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
     }
 
     /* Initialize data */
-    sprite = ee_load_sprite("data/bar_boss");
+    sprite = ee_load_sprite("data/barboss.txt");
 
     /* Main menu */
     display_menu();