Adapt to new endpoint names