Is Kavala being transformed into a Toa by Makuta a problem with the canon? I can change that if it means better compatibility with the overall canon.
Sword of Makuta
I've moved the information about the Sword of Makuta to Kavala's page as you requested. The "Sword of Makuta" page can now be deleted.