add empty next client samples
rename some methods for next response