Changed some variable names for better clarity in weapon-related classes.