More server changes. Now server knows about name change.