Add backward compatibility for the API name changes