changed some more old names from server to daemon