diff --git a/config/bonusnames.txt b/config/bonusnames.txt
index 74d9443ed..b2b70e3c0 100644
--- a/config/bonusnames.txt
+++ b/config/bonusnames.txt
@@ -1,5 +1,4 @@
 Bonus	Name (30 characters?)	Description (30)
-NO_SHOTING_PENALTY	No Shooting penalty?	???
 ADDITIONAL_RETALIATION	Additional retaliations	May Retaliate %d extra times
 ATTACKS_ALL_ADJACENT	Attack all around	Attacks all adjacent enemies
 RETURN_AFTER_STRIKE	Attack and Return	Returns after melee attack
diff --git a/lib/BattleState.cpp b/lib/BattleState.cpp
index 2dcd95cc8..2879d1151 100644
--- a/lib/BattleState.cpp
+++ b/lib/BattleState.cpp
@@ -607,7 +607,7 @@ TDmgRange BattleInfo::calculateDmgRange( const CStack* attacker, const CStack* d
 	};
 
 	//wall / distance penalty + advanced air shield
-	if (shooting && !NBonus::hasOfType(attackerHero, Bonus::NO_SHOTING_PENALTY) && (
+	if (shooting && !NBonus::hasOfType(attackerHero, Bonus::NO_DISTANCE_PENALTY) && (
 		hasDistancePenalty(attacker, defender->position) || hasWallPenalty(attacker, defender->position) ||
 		HLP::hasAdvancedAirShield(defender) )
 		)
diff --git a/lib/CArtHandler.cpp b/lib/CArtHandler.cpp
index bf512c9cf..daab74d57 100644
--- a/lib/CArtHandler.cpp
+++ b/lib/CArtHandler.cpp
@@ -644,7 +644,7 @@ void CArtHandler::addBonuses()
 	giveArtBonus(89,Bonus::EARTH_SPELLS,0);//Tome of Earth Magic
 
 	giveArtBonus(90,Bonus::WATER_WALKING, 0, 1);//Boots of Levitation
-	giveArtBonus(91,Bonus::NO_SHOTING_PENALTY,0, 0, 0, new HasAnotherBonusLimiter(Bonus::SHOOTER));//Golden Bow
+	giveArtBonus(91,Bonus::NO_DISTANCE_PENALTY,0, 0, 0, new HasAnotherBonusLimiter(Bonus::SHOOTER));//Golden Bow
 	giveArtBonus(92,Bonus::SPELL_IMMUNITY,0,35);//Sphere of Permanence
 	giveArtBonus(93,Bonus::NEGATE_ALL_NATURAL_IMMUNITIES,0);//Orb of Vulnerability
 
@@ -735,7 +735,7 @@ void CArtHandler::addBonuses()
 	giveArtBonus(136, Bonus::FREE_SHIP_BOARDING, 0);
 
 	//Bow of the Sharpshooter
-	giveArtBonus(137, Bonus::NO_SHOTING_PENALTY, 0);
+	giveArtBonus(137, Bonus::NO_DISTANCE_PENALTY, 0);
 	giveArtBonus(137, Bonus::FREE_SHOOTING, 0);
 
 	//Wizard's Well
diff --git a/lib/CCreatureSet.cpp b/lib/CCreatureSet.cpp
index e84dd0077..bd8fcbd13 100644
--- a/lib/CCreatureSet.cpp
+++ b/lib/CCreatureSet.cpp
@@ -556,7 +556,6 @@ std::string CStackInstance::bonusToString(Bonus *bonus, bool description) const
 				case Bonus::UNLIMITED_RETALIATIONS:
 				case Bonus::SHOOTER:
 				case Bonus::FREE_SHOOTING:
-				case Bonus::NO_SHOTING_PENALTY:
 				case Bonus::NO_MELEE_PENALTY:
 				case Bonus::NO_DISTANCE_PENALTY:
 				case Bonus::NO_OBSTACLES_PENALTY:
diff --git a/lib/HeroBonus.h b/lib/HeroBonus.h
index 9beaf53e1..c6234eb52 100644
--- a/lib/HeroBonus.h
+++ b/lib/HeroBonus.h
@@ -56,7 +56,6 @@ namespace PrimarySkill
 	BONUS_NAME(FIRE_SPELL_DMG_PREMY) \
 	BONUS_NAME(WATER_SPELL_DMG_PREMY) \
 	BONUS_NAME(WATER_WALKING) /*subtype 1 - without penalty, 2 - with penalty*/ \
-	BONUS_NAME(NO_SHOTING_PENALTY) /* duplicates NO_DISTANCE_PENALTY or FREE_SHOOTHING?*/\
 	BONUS_NAME(NEGATE_ALL_NATURAL_IMMUNITIES) \
 	BONUS_NAME(STACK_HEALTH) \
 	BONUS_NAME(BLOCK_MORALE) \