Rename and repackage methods in MagicObject and ShadowThingy.