changed names for consistency
started work in weapon class