diff --git a/data/battle/bullets.json b/data/battle/bullets.json
index 9f4a895..ceb516e 100644
--- a/data/battle/bullets.json
+++ b/data/battle/bullets.json
@@ -2,7 +2,7 @@
 	{
 		"type" : "BT_PARTICLE",
 		"damage" : 1,
-		"textureName" : "gfx/bullets/particleBolt.png",
+		"texture" : "gfx/bullets/particleBolt.png",
 		"sound" : "SND_PARTICLE",
 		"flags" : "BF_NONE"
 	},
@@ -10,7 +10,7 @@
 	{
 		"type" : "BT_PLASMA",
 		"damage" : 3,
-		"textureName" : "gfx/bullets/plasmaBolt.png",
+		"texture" : "gfx/bullets/plasmaBolt.png",
 		"sound" : "SND_PLASMA",
 		"flags" : "BF_NONE"
 	},
@@ -18,7 +18,7 @@
 	{
 		"type" : "BT_MISSILE",
 		"damage" : 75,
-		"textureName" : "gfx/bullets/missile.png",
+		"texture" : "gfx/bullets/missile.png",
 		"sound" : "SND_MISSILE",
 		"flags" : "BF_ENGINE+BF_EXPLODES"
 	},
@@ -26,7 +26,7 @@
 	{
 		"type" : "BT_MAG",
 		"damage" : 10,
-		"textureName" : "gfx/bullets/magBolt.png",
+		"texture" : "gfx/bullets/magBolt.png",
 		"sound" : "SND_MAG",
 		"flags" : "BF_SYSTEM_DAMAGE"
 	},
@@ -34,7 +34,7 @@
 	{
 		"type" : "BT_LASER",
 		"damage" : 5,
-		"textureName" : "gfx/bullets/laser.png",
+		"texture" : "gfx/bullets/laser.png",
 		"sound" : "SND_LASER",
 		"flags" : "BF_SHIELD_DAMAGE"
 	},
@@ -42,7 +42,7 @@
 	{
 		"type" : "BT_ROCKET",
 		"damage" : 50,
-		"textureName" : "gfx/bullets/missile.png",
+		"texture" : "gfx/bullets/missile.png",
 		"sound" : "SND_MISSILE",
 		"flags" : "BF_ENGINE+BF_EXPLODES"
 	}
diff --git a/data/battle/items.json b/data/battle/items.json
index c016d5f..cb4ed55 100644
--- a/data/battle/items.json
+++ b/data/battle/items.json
@@ -1,10 +1,10 @@
 [
 	{
 		"name" : "crate",
-		"textureName" : "gfx/items/crate.png"
+		"texture" : "gfx/items/crate.png"
 	},
 	{
 		"name" : "smallCrate",
-		"textureName" : "gfx/items/smallCrate.png"
+		"texture" : "gfx/items/smallCrate.png"
 	}
 ]
diff --git a/data/craft/civilian.json b/data/craft/civilian.json
index 17d6906..0db94cc 100644
--- a/data/craft/civilian.json
+++ b/data/craft/civilian.json
@@ -5,7 +5,7 @@
 	"speed" : 2,
 	"reloadTime" : 0,
 	"shieldRechargeRate" : 0,
-	"textureName" : "gfx/craft/civilian01.png",
+	"texture" : "gfx/craft/civilian01.png",
 	"flags" : "EF_MISSION_TARGET+EF_RETREATING+EF_TAKES_DAMAGE",
 	"aiFlags" : "AIF_GOAL_EXTRACTION+AIF_AVOIDS_COMBAT+AIF_FOLLOWS_PLAYER"
 }
diff --git a/data/craft/munitionsTransport.json b/data/craft/munitionsTransport.json
index fbae388..9998c16 100644
--- a/data/craft/munitionsTransport.json
+++ b/data/craft/munitionsTransport.json
@@ -5,7 +5,7 @@
 	"speed" : 1.5,
 	"reloadTime" : 10,
 	"shieldRechargeRate" : 0,
-	"textureName" : "gfx/craft/munitionsTransport.png",
+	"texture" : "gfx/craft/munitionsTransport.png",
 	"flags" : "EF_TAKES_DAMAGE",
 	"aiFlags" : "AIF_AVOIDS_COMBAT"
 }
diff --git a/data/craft/shuttle.json b/data/craft/shuttle.json
index 14be267..2b538fb 100644
--- a/data/craft/shuttle.json
+++ b/data/craft/shuttle.json
@@ -5,7 +5,7 @@
 	"speed" : 2,
 	"reloadTime" : 0,
 	"shieldRechargeRate" : 60,
-	"textureName" : "gfx/craft/shuttle.png",
+	"texture" : "gfx/craft/shuttle.png",
 	"flags" : "EF_COLLECTS_ITEMS+EF_TAKES_DAMAGE",
 	"aiFlags" : "AIF_AVOIDS_COMBAT+AIF_COLLECTS_ITEMS"
 }
diff --git a/data/craft/supplyShip.json b/data/craft/supplyShip.json
index 8472eb8..b2eb959 100644
--- a/data/craft/supplyShip.json
+++ b/data/craft/supplyShip.json
@@ -5,7 +5,7 @@
 	"speed" : 1.5,
 	"reloadTime" : 10,
 	"shieldRechargeRate" : 0,
-	"textureName" : "gfx/craft/supplyShip.png",
+	"texture" : "gfx/craft/supplyShip.png",
 	"deathType" : "DT_NO_SPIN",
 	"flags" : "EF_TAKES_DAMAGE",
 	"aiFlags" : "AIF_AVOIDS_COMBAT"
diff --git a/data/craft/tug.json b/data/craft/tug.json
index 2b5583d..b8392d5 100644
--- a/data/craft/tug.json
+++ b/data/craft/tug.json
@@ -5,7 +5,7 @@
 	"speed" : 1.85,
 	"reloadTime" : 10,
 	"shieldRechargeRate" : 0,
-	"textureName" : "gfx/craft/tug.png",
+	"texture" : "gfx/craft/tug.png",
 	"guns" : [
 		{
 			"type" : "BT_PARTICLE",
diff --git a/data/fighters/ataf.json b/data/fighters/ataf.json
index f4a9865..3b02ec3 100644
--- a/data/fighters/ataf.json
+++ b/data/fighters/ataf.json
@@ -5,7 +5,7 @@
 	"speed" : 2.25,
 	"reloadTime" : 8,
 	"shieldRechargeRate" : 5,
-	"textureName" : "gfx/fighters/ataf.png",
+	"texture" : "gfx/fighters/ataf.png",
 	"guns" : [
 		{
 			"type" : "BT_PLASMA",
diff --git a/data/fighters/cannonDart.json b/data/fighters/cannonDart.json
index 262e811..8da3cb8 100644
--- a/data/fighters/cannonDart.json
+++ b/data/fighters/cannonDart.json
@@ -5,7 +5,7 @@
 	"speed" : 2.1,
 	"reloadTime" : 24,
 	"shieldRechargeRate" : 0,
-	"textureName" : "gfx/fighters/dart01.png",
+	"texture" : "gfx/fighters/dart01.png",
 	"guns" : [
 		{
 			"type" : "BT_PARTICLE",
diff --git a/data/fighters/dart.json b/data/fighters/dart.json
index ff50455..3862aec 100644
--- a/data/fighters/dart.json
+++ b/data/fighters/dart.json
@@ -5,7 +5,7 @@
 	"speed" : 2.1,
 	"reloadTime" : 24,
 	"shieldRechargeRate" : 0,
-	"textureName" : "gfx/fighters/dart01.png",
+	"texture" : "gfx/fighters/dart01.png",
 	"guns" : [
 		{
 			"type" : "BT_PARTICLE",
diff --git a/data/fighters/firefly.json b/data/fighters/firefly.json
index 93e4281..9cfdddd 100644
--- a/data/fighters/firefly.json
+++ b/data/fighters/firefly.json
@@ -5,7 +5,7 @@
 	"speed" : 1.85,
 	"reloadTime" : 25,
 	"shieldRechargeRate" : 30,
-	"textureName" : "gfx/fighters/firefly.png",
+	"texture" : "gfx/fighters/firefly.png",
 	"guns" : [
 		{
 			"type" : "BT_PARTICLE",
diff --git a/data/fighters/hammerhead.json b/data/fighters/hammerhead.json
index d204e0a..caca23b 100644
--- a/data/fighters/hammerhead.json
+++ b/data/fighters/hammerhead.json
@@ -5,7 +5,7 @@
 	"speed" : 1.7,
 	"reloadTime" : 35,
 	"shieldRechargeRate" : 60,
-	"textureName" : "gfx/fighters/hammerhead.png",
+	"texture" : "gfx/fighters/hammerhead.png",
 	"guns" : [
 		{
 			"type" : "BT_PLASMA",
diff --git a/data/fighters/hyenaA.json b/data/fighters/hyenaA.json
index 2763245..fae1cfb 100644
--- a/data/fighters/hyenaA.json
+++ b/data/fighters/hyenaA.json
@@ -5,7 +5,7 @@
 	"speed" : 1.85,
 	"reloadTime" : 15,
 	"shieldRechargeRate" : 40,
-	"textureName" : "gfx/fighters/hyena.png",
+	"texture" : "gfx/fighters/hyena.png",
 	"guns" : [
 		{
 			"type" : "BT_PLASMA",
diff --git a/data/fighters/hyenaB.json b/data/fighters/hyenaB.json
index f9eb884..07a49db 100644
--- a/data/fighters/hyenaB.json
+++ b/data/fighters/hyenaB.json
@@ -5,7 +5,7 @@
 	"speed" : 1.85,
 	"reloadTime" : 15,
 	"shieldRechargeRate" : 40,
-	"textureName" : "gfx/fighters/hyena.png",
+	"texture" : "gfx/fighters/hyena.png",
 	"guns" : [
 		{
 			"type" : "BT_PLASMA",
diff --git a/data/fighters/jackal.json b/data/fighters/jackal.json
index 2286b81..733b91b 100644
--- a/data/fighters/jackal.json
+++ b/data/fighters/jackal.json
@@ -5,7 +5,7 @@
 	"speed" : 2,
 	"reloadTime" : 14,
 	"shieldRechargeRate" : 45,
-	"textureName" : "gfx/fighters/jackal.png",
+	"texture" : "gfx/fighters/jackal.png",
 	"guns" : [
 		{
 			"type" : "BT_PLASMA",
diff --git a/data/fighters/khepri.json b/data/fighters/khepri.json
index 6261ba9..8e23e38 100644
--- a/data/fighters/khepri.json
+++ b/data/fighters/khepri.json
@@ -5,7 +5,7 @@
 	"speed" : 1.7,
 	"reloadTime" : 35,
 	"shieldRechargeRate" : 60,
-	"textureName" : "gfx/fighters/khepri.png",
+	"texture" : "gfx/fighters/khepri.png",
 	"guns" : [
 		{
 			"type" : "BT_PLASMA",
diff --git a/data/fighters/kingfisher.json b/data/fighters/kingfisher.json
index 8d45546..4882f2a 100644
--- a/data/fighters/kingfisher.json
+++ b/data/fighters/kingfisher.json
@@ -5,7 +5,7 @@
 	"speed" : 1.85,
 	"reloadTime" : 16,
 	"shieldRechargeRate" : 60,
-	"textureName" : "gfx/fighters/kingfisher.png",
+	"texture" : "gfx/fighters/kingfisher.png",
 	"guns" : [
 		{
 			"type" : "BT_PLASMA",
diff --git a/data/fighters/leopard.json b/data/fighters/leopard.json
index ec049ed..9cdde33 100644
--- a/data/fighters/leopard.json
+++ b/data/fighters/leopard.json
@@ -5,7 +5,7 @@
 	"speed" : 1.7,
 	"reloadTime" : 16,
 	"shieldRechargeRate" : 70,
-	"textureName" : "gfx/fighters/leopard.png",
+	"texture" : "gfx/fighters/leopard.png",
 	"guns" : [
 		{
 			"type" : "BT_PLASMA",
diff --git a/data/fighters/lynx.json b/data/fighters/lynx.json
index 45193c3..a01581d 100644
--- a/data/fighters/lynx.json
+++ b/data/fighters/lynx.json
@@ -5,7 +5,7 @@
 	"speed" : 1.7,
 	"reloadTime" : 35,
 	"shieldRechargeRate" : 60,
-	"textureName" : "gfx/fighters/lynx.png",
+	"texture" : "gfx/fighters/lynx.png",
 	"guns" : [
 		{
 			"type" : "BT_PLASMA",
diff --git a/data/fighters/mantis.json b/data/fighters/mantis.json
index bae906c..7165a17 100644
--- a/data/fighters/mantis.json
+++ b/data/fighters/mantis.json
@@ -5,7 +5,7 @@
 	"speed" : 1.85,
 	"reloadTime" : 25,
 	"shieldRechargeRate" : 35,
-	"textureName" : "gfx/fighters/mantis.png",
+	"texture" : "gfx/fighters/mantis.png",
 	"guns" : [
 		{
 			"type" : "BT_PLASMA",
diff --git a/data/fighters/missileDart.json b/data/fighters/missileDart.json
index 84da8d1..8088334 100644
--- a/data/fighters/missileDart.json
+++ b/data/fighters/missileDart.json
@@ -5,7 +5,7 @@
 	"speed" : 2.1,
 	"reloadTime" : 24,
 	"shieldRechargeRate" : 0,
-	"textureName" : "gfx/fighters/dart01.png",
+	"texture" : "gfx/fighters/dart01.png",
 	"missiles" : 999,
 	"flags" : "EF_TAKES_DAMAGE"
 }
diff --git a/data/fighters/nymph.json b/data/fighters/nymph.json
index e052b69..0e9a0a2 100644
--- a/data/fighters/nymph.json
+++ b/data/fighters/nymph.json
@@ -5,7 +5,7 @@
 	"speed" : 2,
 	"reloadTime" : 14,
 	"shieldRechargeRate" : 30,
-	"textureName" : "gfx/fighters/nymph.png",
+	"texture" : "gfx/fighters/nymph.png",
 	"guns" : [
 		{
 			"type" : "BT_PLASMA",
diff --git a/data/fighters/ray.json b/data/fighters/ray.json
index a6a8730..272dba7 100644
--- a/data/fighters/ray.json
+++ b/data/fighters/ray.json
@@ -5,7 +5,7 @@
 	"speed" : 1.85,
 	"reloadTime" : 16,
 	"shieldRechargeRate" : 60,
-	"textureName" : "gfx/fighters/ray.png",
+	"texture" : "gfx/fighters/ray.png",
 	"guns" : [
 		{
 			"type" : "BT_PLASMA",
diff --git a/data/fighters/rook.json b/data/fighters/rook.json
index 0c74bf9..40d9295 100644
--- a/data/fighters/rook.json
+++ b/data/fighters/rook.json
@@ -5,7 +5,7 @@
 	"speed" : 1.7,
 	"reloadTime" : 12,
 	"shieldRechargeRate" : 45,
-	"textureName" : "gfx/fighters/rook.png",
+	"texture" : "gfx/fighters/rook.png",
 	"guns" : [
 		{
 			"type" : "BT_PLASMA",
diff --git a/data/fighters/scarab.json b/data/fighters/scarab.json
index 34f70c8..da3ff0e 100644
--- a/data/fighters/scarab.json
+++ b/data/fighters/scarab.json
@@ -5,7 +5,7 @@
 	"speed" : 1.7,
 	"reloadTime" : 35,
 	"shieldRechargeRate" : 60,
-	"textureName" : "gfx/fighters/scarab.png",
+	"texture" : "gfx/fighters/scarab.png",
 	"guns" : [
 		{
 			"type" : "BT_PLASMA",
diff --git a/data/fighters/simpleDart.json b/data/fighters/simpleDart.json
index f844d7c..a1d4e9d 100644
--- a/data/fighters/simpleDart.json
+++ b/data/fighters/simpleDart.json
@@ -5,7 +5,7 @@
 	"speed" : 2.1,
 	"reloadTime" : 24,
 	"shieldRechargeRate" : 0,
-	"textureName" : "gfx/fighters/dart01.png",
+	"texture" : "gfx/fighters/dart01.png",
 	"guns" : [
 		{
 			"type" : "BT_PARTICLE",
diff --git a/data/fighters/sphinx.json b/data/fighters/sphinx.json
index a0611a6..7b46272 100644
--- a/data/fighters/sphinx.json
+++ b/data/fighters/sphinx.json
@@ -5,7 +5,7 @@
 	"speed" : 1.85,
 	"reloadTime" : 14,
 	"shieldRechargeRate" : 60,
-	"textureName" : "gfx/fighters/sphinx.png",
+	"texture" : "gfx/fighters/sphinx.png",
 	"guns" : [
 		{
 			"type" : "BT_PLASMA",
diff --git a/data/fighters/staticDart.json b/data/fighters/staticDart.json
index aa5becd..b427114 100644
--- a/data/fighters/staticDart.json
+++ b/data/fighters/staticDart.json
@@ -5,6 +5,6 @@
 	"speed" : 0,
 	"reloadTime" : 24,
 	"shieldRechargeRate" : 0,
-	"textureName" : "gfx/fighters/dart01.png",
+	"texture" : "gfx/fighters/dart01.png",
 	"flags" : "EF_TAKES_DAMAGE"
 }
diff --git a/data/fighters/taf.json b/data/fighters/taf.json
index 53c1bf8..b145f7e 100644
--- a/data/fighters/taf.json
+++ b/data/fighters/taf.json
@@ -5,7 +5,7 @@
 	"speed" : 2,
 	"reloadTime" : 16,
 	"shieldRechargeRate" : 50,
-	"textureName" : "gfx/fighters/taf.png",
+	"texture" : "gfx/fighters/taf.png",
 	"guns" : [
 		{
 			"type" : "BT_PLASMA",
diff --git a/data/fighters/thunderhead.json b/data/fighters/thunderhead.json
index 6e9ee2d..cca33cb 100644
--- a/data/fighters/thunderhead.json
+++ b/data/fighters/thunderhead.json
@@ -5,7 +5,7 @@
 	"speed" : 1.7,
 	"reloadTime" : 12,
 	"shieldRechargeRate" : 65,
-	"textureName" : "gfx/fighters/thunderhead.png",
+	"texture" : "gfx/fighters/thunderhead.png",
 	"guns" : [
 		{
 			"type" : "BT_PLASMA",
diff --git a/data/fighters/unarmedDart.json b/data/fighters/unarmedDart.json
index 2d93bf5..42e81ed 100644
--- a/data/fighters/unarmedDart.json
+++ b/data/fighters/unarmedDart.json
@@ -5,6 +5,6 @@
 	"speed" : 2.1,
 	"reloadTime" : 24,
 	"shieldRechargeRate" : 0,
-	"textureName" : "gfx/fighters/dart01.png",
+	"texture" : "gfx/fighters/dart01.png",
 	"flags" : "EF_TAKES_DAMAGE"
 }
diff --git a/data/turrets/plasmaTurret.json b/data/turrets/plasmaTurret.json
index 2ab550c..e34e0b8 100644
--- a/data/turrets/plasmaTurret.json
+++ b/data/turrets/plasmaTurret.json
@@ -5,7 +5,7 @@
 	"speed" : 0,
 	"reloadTime" : 30,
 	"shieldRechargeRate" : 10,
-	"textureName" : "gfx/cannons/plasmaTurret.png",
+	"texture" : "gfx/cannons/plasmaTurret.png",
 	"deathType" : "DT_NO_SPIN",
 	"guns" : [
 		{
diff --git a/data/turrets/rocketTurret.json b/data/turrets/rocketTurret.json
index d792ea5..5040be9 100644
--- a/data/turrets/rocketTurret.json
+++ b/data/turrets/rocketTurret.json
@@ -5,7 +5,7 @@
 	"speed" : 0,
 	"reloadTime" : 8,
 	"shieldRechargeRate" : 30,
-	"textureName" : "gfx/cannons/rocketTurret.png",
+	"texture" : "gfx/cannons/rocketTurret.png",
 	"deathType" : "DT_NO_SPIN",
 	"guns" : [
 		{
diff --git a/src/battle/bullets.c b/src/battle/bullets.c
index 61bb342..08755ae 100644
--- a/src/battle/bullets.c
+++ b/src/battle/bullets.c
@@ -54,7 +54,7 @@ void initBulletDefs(void)
 		def = &bulletDef[type];
 		def->type = type;
 		def->damage = cJSON_GetObjectItem(node, "damage")->valueint;
-		def->texture = getTexture(cJSON_GetObjectItem(node, "textureName")->valuestring);
+		def->texture = getTexture(cJSON_GetObjectItem(node, "texture")->valuestring);
 		def->sound = lookup(cJSON_GetObjectItem(node, "sound")->valuestring);
 		def->flags = flagsToLong(cJSON_GetObjectItem(node, "flags")->valuestring, NULL);
 		
diff --git a/src/battle/fighters.c b/src/battle/fighters.c
index 7aa7a9b..9f5e026 100644
--- a/src/battle/fighters.c
+++ b/src/battle/fighters.c
@@ -101,7 +101,7 @@ Entity *spawnFighter(char *name, int x, int y, int side)
 
 static void randomizeDart(Entity *dart)
 {
-	char textureName[MAX_DESCRIPTION_LENGTH];
+	char texture[MAX_DESCRIPTION_LENGTH];
 	
 	if (rand() % 5 == 0)
 	{
@@ -128,9 +128,9 @@ static void randomizeDart(Entity *dart)
 	
 	dart->missiles = rand() % 3;
 	
-	sprintf(textureName, "gfx/fighters/dart0%d.png", 1 + rand() % 7);
+	sprintf(texture, "gfx/fighters/dart0%d.png", 1 + rand() % 7);
 	
-	dart->texture = getTexture(textureName);
+	dart->texture = getTexture(texture);
 }
 
 static void randomizeDartGuns(Entity *dart)
@@ -657,7 +657,7 @@ static void loadFighterDef(char *filename)
 	e->speed = cJSON_GetObjectItem(root, "speed")->valuedouble;
 	e->reloadTime = cJSON_GetObjectItem(root, "reloadTime")->valueint;
 	e->shieldRechargeRate = cJSON_GetObjectItem(root, "shieldRechargeRate")->valueint;
-	e->texture = getTexture(cJSON_GetObjectItem(root, "textureName")->valuestring);
+	e->texture = getTexture(cJSON_GetObjectItem(root, "texture")->valuestring);
 	
 	SDL_QueryTexture(e->texture, NULL, NULL, &e->w, &e->h);
 	
diff --git a/src/battle/items.c b/src/battle/items.c
index 82c4b87..b620748 100644
--- a/src/battle/items.c
+++ b/src/battle/items.c
@@ -47,7 +47,7 @@ void loadItemDefs(void)
 		e->active = 1;
 		STRNCPY(e->name, cJSON_GetObjectItem(node, "name")->valuestring, MAX_NAME_LENGTH);
 		STRNCPY(e->defName, cJSON_GetObjectItem(node, "name")->valuestring, MAX_NAME_LENGTH);
-		e->texture = getTexture(cJSON_GetObjectItem(node, "textureName")->valuestring);
+		e->texture = getTexture(cJSON_GetObjectItem(node, "texture")->valuestring);
 		
 		e->health = e->maxHealth = FPS;