All variables and method names rectified.
Specific Weapon Decorators removed to be replaced a generic set of Weapon Decorators