Feels like Infusions should be a subcategory of Charges, thoughts?

The tooltip is almost the same too. It would even make sense to standardize the duration to 20 seconds (or better yet, ask yourself why you have a duration on all this stuff in the first place - just remove all infusions/charges when you enter a boss arena)