Fixing the Mage namespace