rename $master_* to $server_* for consistency