Fix to new server/ namespace