diff --git a/data/sound/coffeeout.wav b/data/sound/coffee_out.wav
similarity index 100%
rename from data/sound/coffeeout.wav
rename to data/sound/coffee_out.wav
diff --git a/data/sound/debian_pick.wav b/data/sound/debian_pickup.wav
similarity index 100%
rename from data/sound/debian_pick.wav
rename to data/sound/debian_pickup.wav
diff --git a/data/sound/hiscore.wav b/data/sound/hi_score_achieved.wav
similarity index 100%
rename from data/sound/hiscore.wav
rename to data/sound/hi_score_achieved.wav
diff --git a/data/sound/itemdrop.wav b/data/sound/item_drop.wav
similarity index 100%
rename from data/sound/itemdrop.wav
rename to data/sound/item_drop.wav
diff --git a/data/sound/itempickup.wav b/data/sound/item_pickup.wav
similarity index 100%
rename from data/sound/itempickup.wav
rename to data/sound/item_pickup.wav
diff --git a/data/sound/powerball.wav b/data/sound/power_ball_explosion.wav
similarity index 100%
rename from data/sound/powerball.wav
rename to data/sound/power_ball_explosion.wav
diff --git a/data/sound/tnt.wav b/data/sound/tnt.wav
deleted file mode 100644
index 3ad8006..0000000
Binary files a/data/sound/tnt.wav and /dev/null differ
diff --git a/source/balloon_manager.cpp b/source/balloon_manager.cpp
index 2b2db3c..8399fd9 100644
--- a/source/balloon_manager.cpp
+++ b/source/balloon_manager.cpp
@@ -321,7 +321,7 @@ int BalloonManager::destroyAllBalloons()
     }
 
     balloon_deploy_counter_ = 300;
-    JA_PlaySound(Resource::get()->getSound("powerball.wav"));
+    JA_PlaySound(Resource::get()->getSound("power_ball_explosion.wav"));
     Screen::get()->flash(flash_color, 3);
     Screen::get()->shake();
 
diff --git a/source/director.cpp b/source/director.cpp
index aed8ab0..808d55a 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -397,16 +397,16 @@ void Director::setFileList()
 	Asset::get()->add(prefix + "/data/sound/bubble4.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/bullet.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/clock.wav", AssetType::SOUND);
-	Asset::get()->add(prefix + "/data/sound/coffeeout.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/coffee_out.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/continue_clock.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/game_start.wav", AssetType::SOUND);
-	Asset::get()->add(prefix + "/data/sound/hiscore.wav", AssetType::SOUND);
-	Asset::get()->add(prefix + "/data/sound/itemdrop.wav", AssetType::SOUND);
-	Asset::get()->add(prefix + "/data/sound/itempickup.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/hi_score_achieved.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/item_drop.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/item_pickup.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/logo.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/notify.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/player_collision.wav", AssetType::SOUND);
-	Asset::get()->add(prefix + "/data/sound/powerball.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/power_ball_explosion.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/stage_change.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/tabe.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/title.wav", AssetType::SOUND);
@@ -416,7 +416,7 @@ void Director::setFileList()
 	Asset::get()->add(prefix + "/data/sound/voice_power_up.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/walk.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/debian_drop.wav", AssetType::SOUND);
-	Asset::get()->add(prefix + "/data/sound/debian_pick.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/debian_pickup.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/tabe_hit.wav", AssetType::SOUND);
 
 	// Shaders
diff --git a/source/game.cpp b/source/game.cpp
index 56811cf..23bd482 100644
--- a/source/game.cpp
+++ b/source/game.cpp
@@ -205,7 +205,7 @@ void Game::updateHiScore()
 			if (hi_score_achieved_ == false)
 			{
 				hi_score_achieved_ = true;
-				JA_PlaySound(Resource::get()->getSound("hiscore.wav"));
+				JA_PlaySound(Resource::get()->getSound("hi_score_achieved.wav"));
 			}
 		}
 	}
@@ -467,7 +467,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr<Player> &player)
 					player->addScore(1000);
 					const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(0)->getWidth()) / 2;
 					createItemText(x, game_text_textures_.at(0));
-					JA_PlaySound(Resource::get()->getSound("itempickup.wav"));
+					JA_PlaySound(Resource::get()->getSound("item_pickup.wav"));
 					break;
 				}
 				case ItemType::GAVINA:
@@ -475,7 +475,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr<Player> &player)
 					player->addScore(2500);
 					const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(1)->getWidth()) / 2;
 					createItemText(x, game_text_textures_.at(1));
-					JA_PlaySound(Resource::get()->getSound("itempickup.wav"));
+					JA_PlaySound(Resource::get()->getSound("item_pickup.wav"));
 					break;
 				}
 				case ItemType::PACMAR:
@@ -483,7 +483,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr<Player> &player)
 					player->addScore(5000);
 					const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(2)->getWidth()) / 2;
 					createItemText(x, game_text_textures_.at(2));
-					JA_PlaySound(Resource::get()->getSound("itempickup.wav"));
+					JA_PlaySound(Resource::get()->getSound("item_pickup.wav"));
 					break;
 				}
 				case ItemType::DEBIAN:
@@ -491,7 +491,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr<Player> &player)
 					player->addScore(100000);
 					const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(6)->getWidth()) / 2;
 					createItemText(x, game_text_textures_.at(6));
-					JA_PlaySound(Resource::get()->getSound("debian_pick.wav"));
+					JA_PlaySound(Resource::get()->getSound("debian_pickup.wav"));
 					break;
 				}
 				case ItemType::CLOCK:
@@ -499,7 +499,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr<Player> &player)
 					enableTimeStopItem();
 					const auto x = item->getPosX() + (item->getWidth() - game_text_textures_.at(5)->getWidth()) / 2;
 					createItemText(x, game_text_textures_.at(5));
-					JA_PlaySound(Resource::get()->getSound("itempickup.wav"));
+					JA_PlaySound(Resource::get()->getSound("item_pickup.wav"));
 					break;
 				}
 				case ItemType::COFFEE:
@@ -561,7 +561,7 @@ void Game::checkBulletCollision()
 					if (rand() % 3 == 0)
 					{
 						createItem(ItemType::COFFEE, pos.x, pos.y);
-						// JA_PlaySound(Resource::get()->getSound("itemdrop.wav"));
+						// JA_PlaySound(Resource::get()->getSound("item_drop.wav"));
 					}
 					else
 					{
@@ -589,7 +589,7 @@ void Game::checkBulletCollision()
 						if (dropped_item != ItemType::COFFEE_MACHINE)
 						{
 							createItem(dropped_item, balloon->getPosX(), balloon->getPosY());
-							JA_PlaySound(Resource::get()->getSound("itemdrop.wav"));
+							JA_PlaySound(Resource::get()->getSound("item_drop.wav"));
 						}
 						else
 						{
@@ -894,7 +894,7 @@ void Game::killPlayer(std::shared_ptr<Player> &player)
 		// Lo pierde
 		player->removeExtraHit();
 		throwCoffee(player->getPosX() + (player->getWidth() / 2), player->getPosY() + (player->getHeight() / 2));
-		JA_PlaySound(Resource::get()->getSound("coffeeout.wav"));
+		JA_PlaySound(Resource::get()->getSound("coffee_out.wav"));
 		screen_->shake();
 	}
 	else