name changes - consistent client/server