Replace references of switchboard to new location