More namespace fixes, remove the __ from the switchboard as we aren't using PHP4 function names anymore