Classifications are messy, but in addition to the other items mentioned already, I would say that some people would break out "power electronics"[1] as its own field.

[1]: https://en.wikipedia.org/wiki/Power_electronics