diff --git a/lib/ansible/modules/network/avi/avi_api_session.py b/lib/ansible/modules/network/avi/avi_api_session.py
index e6783bcc7c8..3cf5bc4e59d 100644
--- a/lib/ansible/modules/network/avi/avi_api_session.py
+++ b/lib/ansible/modules/network/avi/avi_api_session.py
@@ -115,8 +115,8 @@ from copy import deepcopy
 
 try:
     from ansible.module_utils.network.avi.avi import (
-        avi_common_argument_spec, ansible_return, AviCredentials, HAS_AVI)
-    from avi.sdk.avi_api import ApiSession
+        avi_common_argument_spec, ansible_return, HAS_AVI)
+    from avi.sdk.avi_api import ApiSession, AviCredentials
     from avi.sdk.utils.ansible_utils import avi_obj_cmp, cleanup_absent_fields
 
 except ImportError:
diff --git a/lib/ansible/modules/network/avi/avi_api_version.py b/lib/ansible/modules/network/avi/avi_api_version.py
index 16df11ce5aa..00d8e9c01b1 100644
--- a/lib/ansible/modules/network/avi/avi_api_version.py
+++ b/lib/ansible/modules/network/avi/avi_api_version.py
@@ -55,8 +55,8 @@ from ansible.module_utils.basic import AnsibleModule
 
 try:
     from ansible.module_utils.network.avi.avi import (
-        avi_common_argument_spec, HAS_AVI, AviCredentials)
-    from avi.sdk.avi_api import ApiSession
+        avi_common_argument_spec, HAS_AVI)
+    from avi.sdk.avi_api import ApiSession, AviCredentials
 except ImportError:
     HAS_AVI = False
 
diff --git a/lib/ansible/modules/network/avi/avi_gslbservice_patch_member.py b/lib/ansible/modules/network/avi/avi_gslbservice_patch_member.py
index 917cf2adcb5..c304eb7bcc0 100644
--- a/lib/ansible/modules/network/avi/avi_gslbservice_patch_member.py
+++ b/lib/ansible/modules/network/avi/avi_gslbservice_patch_member.py
@@ -114,10 +114,10 @@ HAS_AVI = True
 try:
     from ansible.module_utils.network.avi.avi import (
         avi_common_argument_spec, HAS_AVI)
-    from avi.sdk.avi_api import ApiSession
+    from avi.sdk.avi_api import ApiSession, AviCredentials
     from avi.sdk.utils.ansible_utils import (
         avi_obj_cmp, cleanup_absent_fields, ansible_return,
-        AviCheckModeResponse, AviCredentials)
+        AviCheckModeResponse)
 except ImportError:
     HAS_AVI = False
 
diff --git a/lib/ansible/modules/network/avi/avi_useraccount.py b/lib/ansible/modules/network/avi/avi_useraccount.py
index 08ed87c75d8..600f07d7fab 100644
--- a/lib/ansible/modules/network/avi/avi_useraccount.py
+++ b/lib/ansible/modules/network/avi/avi_useraccount.py
@@ -78,8 +78,8 @@ from copy import deepcopy
 
 try:
     from ansible.module_utils.network.avi.avi import (
-        avi_common_argument_spec, ansible_return, AviCredentials, HAS_AVI)
-    from avi.sdk.avi_api import ApiSession
+        avi_common_argument_spec, ansible_return, HAS_AVI)
+    from avi.sdk.avi_api import ApiSession, AviCredentials
     from avi.sdk.utils.ansible_utils import avi_obj_cmp, cleanup_absent_fields
 
 except ImportError: