diff --git a/cyborgclient/common/httpclient.py b/cyborgclient/common/httpclient.py
index 9bebe91..c0b066a 100644
--- a/cyborgclient/common/httpclient.py
+++ b/cyborgclient/common/httpclient.py
@@ -156,7 +156,7 @@ class HTTPClient(object):
         kwargs['headers'] = copy.deepcopy(kwargs.get('headers', {}))
         kwargs['headers'].setdefault('User-Agent', USER_AGENT)
         if self.api_version:
-            version_string = 'container-infra %s' % self.api_version
+            version_string = 'accelerator %s' % self.api_version
             kwargs['headers'].setdefault(
                 'OpenStack-API-Version', version_string)
         if self.auth_token:
@@ -334,7 +334,7 @@ class SessionClient(adapter.LegacyJsonAdapter):
         if osprofiler_web:
             kwargs['headers'].update(osprofiler_web.get_trace_id_headers())
         if self.api_version:
-            version_string = 'container-infra %s' % self.api_version
+            version_string = 'accelerator %s' % self.api_version
             kwargs['headers'].setdefault(
                 'OpenStack-API-Version', version_string)
 
diff --git a/cyborgclient/shell.py b/cyborgclient/shell.py
index 3c1a380..e2773b1 100644
--- a/cyborgclient/shell.py
+++ b/cyborgclient/shell.py
@@ -230,7 +230,7 @@ class OpenStackCyborgShell(object):
 
         parser.add_argument('--service-type',
                             metavar='<service-type>',
-                            help=_('Defaults to container-infra for all '
+                            help=_('Defaults to accelerator for all '
                                    'actions.'))
         parser.add_argument('--service_type',
                             help=argparse.SUPPRESS)