Rename ContentApiClientDispatch to ContentApiClient