[Core] Cleanup and rework power type setting [z2500]

Update and power type wrappers

*Note, breaks the current version of the linked Eluna submodule*