Refactored XAPIClient class name to XapiClient