Currently, the name "staff" is used for both melee and ranged combat versions. This can lead to some confusion, because it is not obvious at first glance which combat type will be used. It is pretty clear with a bow and a hammer. The former is a ranged weapon and the latter a melee one.
Therefore, I suggest to rename the ranged combat version to "wand". This will allow you to tell at first glance, that it is a ranged weapon, even if it is one you have never seen before.
