diff --git a/examples/add_attributes_from_csv.py b/examples/add_attributes_from_csv.py
index e05bb1b62..8d6a9cc21 100644
--- a/examples/add_attributes_from_csv.py
+++ b/examples/add_attributes_from_csv.py
@@ -3,7 +3,7 @@
 
 import csv
 from pymisp import PyMISP
-from pymisp import ExpandedPyMISP, MISPAttribute
+from pymisp import PyMISP, MISPAttribute
 from keys import misp_url, misp_key, misp_verifycert
 from requests.packages.urllib3.exceptions import InsecureRequestWarning
 import argparse
@@ -42,7 +42,7 @@
     parser.add_argument("-f", "--attr_file", required=True, help="Attribute CSV file path")
     args = parser.parse_args()
 
-    pymisp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    pymisp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     f = open(args.attr_file, newline='')
     csv_reader = csv.reader(f, delimiter=";")
diff --git a/examples/add_fail2ban_object.py b/examples/add_fail2ban_object.py
index 0ea385807..0b11f031f 100755
--- a/examples/add_fail2ban_object.py
+++ b/examples/add_fail2ban_object.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPEvent
+from pymisp import PyMISP, MISPEvent
 from pymisp.tools import Fail2BanObject
 import argparse
 from base64 import b64decode
@@ -43,7 +43,7 @@ def create_new_event():
     parser.add_argument("-d", "--disable_new", action='store_true', default=False, help="Do not create a new Event.")
     args = parser.parse_args()
 
-    pymisp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, debug=True)
+    pymisp = PyMISP(misp_url, misp_key, misp_verifycert, debug=True)
     event_id = -1
     me = None
     if args.force_new:
diff --git a/examples/add_feed.py b/examples/add_feed.py
index aed6d07f5..76c7c9a4f 100755
--- a/examples/add_feed.py
+++ b/examples/add_feed.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPFeed
+from pymisp import PyMISP, MISPFeed
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -14,7 +14,7 @@
     parser.add_argument("-p", "--provider", required=True, help="Provider name")
     args = parser.parse_args()
 
-    pm = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, debug=True)
+    pm = PyMISP(misp_url, misp_key, misp_verifycert, debug=True)
     feed = MISPFeed()
     feed.format = args.format
     feed.url = args.url
diff --git a/examples/add_filetype_object_from_csv.py b/examples/add_filetype_object_from_csv.py
index 7468b7e9a..f3a2b85b4 100644
--- a/examples/add_filetype_object_from_csv.py
+++ b/examples/add_filetype_object_from_csv.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import csv
-from pymisp import ExpandedPyMISP, MISPObject
+from pymisp import PyMISP, MISPObject
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -28,7 +28,7 @@
     parser.add_argument("-f", "--attr_file", required=True, help="Attribute CSV file path")
     args = parser.parse_args()
 
-    pymisp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    pymisp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     f = open(args.attr_file, newline='')
     csv_reader = csv.reader(f, delimiter=";")
diff --git a/examples/add_generic_object.py b/examples/add_generic_object.py
index ecaae0f4c..043f4dab2 100755
--- a/examples/add_generic_object.py
+++ b/examples/add_generic_object.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import json
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from pymisp.tools import GenericObjectGenerator
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
@@ -19,7 +19,7 @@
     parser.add_argument("-l", "--attr_list", required=True, help="List of attributes")
     args = parser.parse_args()
 
-    pymisp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    pymisp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     misp_object = GenericObjectGenerator(args.type.replace("|", "-"))
     misp_object.generate_attributes(json.loads(args.attr_list))
diff --git a/examples/add_named_attribute.py b/examples/add_named_attribute.py
index 4bbcd9756..0f6053ad3 100755
--- a/examples/add_named_attribute.py
+++ b/examples/add_named_attribute.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -19,7 +19,7 @@
     parser.add_argument("-v", "--value", help="The value of the attribute")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     event = misp.add_attribute(args.event, {'type': args.type, 'value': args.value}, pythonify=True)
     print(event)
diff --git a/examples/add_organisations.py b/examples/add_organisations.py
index e8bc57ac2..07dbd98c9 100644
--- a/examples/add_organisations.py
+++ b/examples/add_organisations.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPOrganisation, MISPSharingGroup
+from pymisp import PyMISP, MISPOrganisation, MISPSharingGroup
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 import csv
@@ -17,7 +17,7 @@
     parser.add_argument("-c", "--csv-import", required=True, help="The CSV file containing the organizations. Format 'orgname,nationality,sector,type,contacts,uuid,local,sharingroup_uuid'")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     # CSV format
     #   orgname,nationality,sector,type,contacts,uuid,local,sharingroup
diff --git a/examples/add_ssh_authorized_keys.py b/examples/add_ssh_authorized_keys.py
index 68d818c09..4e9461309 100755
--- a/examples/add_ssh_authorized_keys.py
+++ b/examples/add_ssh_authorized_keys.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from pymisp.tools import SSHAuthorizedKeysObject
 import traceback
 from keys import misp_url, misp_key, misp_verifycert
@@ -15,7 +15,7 @@
     parser.add_argument("-p", "--path", required=True, help="Path to process (expanded using glob).")
     args = parser.parse_args()
 
-    pymisp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, debug=True)
+    pymisp = PyMISP(misp_url, misp_key, misp_verifycert, debug=True)
 
     for f in glob.glob(args.path):
         try:
diff --git a/examples/add_user.py b/examples/add_user.py
index c50b29a7c..96052b915 100755
--- a/examples/add_user.py
+++ b/examples/add_user.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPUser
+from pymisp import PyMISP, MISPUser
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -12,7 +12,7 @@
     parser.add_argument("-r", "--role_id", required=True, help="Role linked to the user.")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, 'json')
+    misp = PyMISP(misp_url, misp_key, misp_verifycert, 'json')
 
     user = MISPUser()
     user.email = args.email
diff --git a/examples/cache_all.py b/examples/cache_all.py
index 4a3fa0245..a515e853e 100755
--- a/examples/cache_all.py
+++ b/examples/cache_all.py
@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 
 from keys import misp_url, misp_key, misp_verifycert
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 
 
 if __name__ == '__main__':
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
     misp.cache_all_feeds()
diff --git a/examples/create_events.py b/examples/create_events.py
index 1d8c2b4c8..8747cfa2f 100755
--- a/examples/create_events.py
+++ b/examples/create_events.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPEvent
+from pymisp import PyMISP, MISPEvent
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -14,7 +14,7 @@
     parser.add_argument("-t", "--threat", type=int, help="The threat level ID of the newly created event, if applicable. [1-4]")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     event = MISPEvent()
     event.distribution = args.distrib
diff --git a/examples/cytomic_orion.py b/examples/cytomic_orion.py
index 2874b6a5e..4cd096537 100755
--- a/examples/cytomic_orion.py
+++ b/examples/cytomic_orion.py
@@ -16,7 +16,7 @@
 
 '''
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 import os
@@ -519,7 +519,7 @@ def process_attributes_delete(cytomicobj, moduleconfig):
 
     module_config = get_config(misp_url, misp_key, misp_verifycert)
     cytomicobj = cytomicobject
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, debug=cytomicobject.debug)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert, debug=cytomicobject.debug)
 
     cytomicobj.misp = misp
     cytomicobj.args = args
diff --git a/examples/del.py b/examples/del.py
index 81dd774dc..cd25a58b4 100755
--- a/examples/del.py
+++ b/examples/del.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -13,7 +13,7 @@
 
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     if args.event:
         result = misp.delete_event(args.event)
diff --git a/examples/delete_user.py b/examples/delete_user.py
index c579cc4e2..fb7381d8e 100755
--- a/examples/delete_user.py
+++ b/examples/delete_user.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -11,6 +11,6 @@
     parser.add_argument("-i", "--user_id", help="The id of the user you want to delete.")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     print(misp.delete_user(args.user_id))
diff --git a/examples/edit_organisation.py b/examples/edit_organisation.py
index 41bc02457..cf7b75fa2 100755
--- a/examples/edit_organisation.py
+++ b/examples/edit_organisation.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPOrganisation
+from pymisp import PyMISP, MISPOrganisation
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -11,7 +11,7 @@
     parser.add_argument("-e", "--email", help="Email linked to the organisation.")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     org = MISPOrganisation()
     org.id = args.organisation_id
diff --git a/examples/edit_user.py b/examples/edit_user.py
index 74440fdb2..e7d5984cf 100755
--- a/examples/edit_user.py
+++ b/examples/edit_user.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPUser
+from pymisp import PyMISP, MISPUser
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -12,7 +12,7 @@
     parser.add_argument("-e", "--email", help="Email linked to the account.")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
     user = MISPUser
     user.id = args.user_id
     user.email = args.email
diff --git a/examples/events/create_massive_dummy_events.py b/examples/events/create_massive_dummy_events.py
index 0b5575790..c5b6b9af6 100755
--- a/examples/events/create_massive_dummy_events.py
+++ b/examples/events/create_massive_dummy_events.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 try:
     from keys import url, key
     verifycert = False
@@ -19,7 +19,7 @@
     parser.add_argument("-a", "--attribute", type=int, help="Number of attributes per event (default 3000)")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(url, key, verifycert)
+    misp = PyMISP(url, key, verifycert)
     misp.toggle_global_pythonify()
 
     if args.limit is None:
diff --git a/examples/falsepositive_disabletoids.py b/examples/falsepositive_disabletoids.py
index c4a72d100..c09b48499 100755
--- a/examples/falsepositive_disabletoids.py
+++ b/examples/falsepositive_disabletoids.py
@@ -11,7 +11,7 @@
 
 '''
 
-from pymisp import ExpandedPyMISP, MISPEvent
+from pymisp import PyMISP, MISPEvent
 from keys import misp_url, misp_key, misp_verifycert
 from datetime import datetime
 from datetime import date
@@ -30,7 +30,7 @@ def init(url, key, verifycert):
     '''
         Template to get MISP module started
     '''
-    return ExpandedPyMISP(url, key, verifycert, 'json')
+    return PyMISP(url, key, verifycert, 'json')
 
 
 if __name__ == '__main__':
diff --git a/examples/feed-generator/generate.py b/examples/feed-generator/generate.py
index 5a76af57c..27deadff4 100755
--- a/examples/feed-generator/generate.py
+++ b/examples/feed-generator/generate.py
@@ -3,7 +3,7 @@
 import sys
 import json
 import os
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from settings import url, key, ssl, outputdir, filters, valid_attribute_distribution_levels
 try:
     from settings import with_distribution
@@ -40,7 +40,7 @@ def init():
         valid_attribute_distributions = [int(v) for v in valid_attribute_distribution_levels]
     except Exception:
         valid_attribute_distributions = [0, 1, 2, 3, 4, 5]
-    return ExpandedPyMISP(url, key, ssl)
+    return PyMISP(url, key, ssl)
 
 
 def saveEvent(event, misp):
diff --git a/examples/fetch_events_feed.py b/examples/fetch_events_feed.py
index 92a1a7bb4..b729fee4d 100755
--- a/examples/fetch_events_feed.py
+++ b/examples/fetch_events_feed.py
@@ -3,7 +3,7 @@
 
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 
 
 if __name__ == '__main__':
@@ -11,5 +11,5 @@
     parser.add_argument("-f", "--feed", required=True, help="feed's ID to be fetched.")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
     misp.fetch_feed(args.feed)
diff --git a/examples/freetext.py b/examples/freetext.py
index fdadacc1b..63c0a655b 100755
--- a/examples/freetext.py
+++ b/examples/freetext.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
diff --git a/examples/get.py b/examples/get.py
index 6ca3ce8f0..2be44a96b 100755
--- a/examples/get.py
+++ b/examples/get.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 import os
@@ -27,7 +27,7 @@
         print('Output file already exists, abort.')
         exit(0)
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, proxies=proxies)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert, proxies=proxies)
 
     event = misp.get_event(args.event, pythonify=True)
     if args.output:
diff --git a/examples/get_csv.py b/examples/get_csv.py
index d7b5b0a97..92f608e74 100755
--- a/examples/get_csv.py
+++ b/examples/get_csv.py
@@ -3,7 +3,7 @@
 
 import argparse
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 
 
@@ -18,7 +18,7 @@
     parser.add_argument("-f", "--outfile", help="Output file to write the CSV.")
 
     args = parser.parse_args()
-    pymisp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, debug=True)
+    pymisp = PyMISP(misp_url, misp_key, misp_verifycert, debug=True)
     attr = []
     if args.attribute:
         attr += args.attribute
diff --git a/examples/last.py b/examples/last.py
index 3fabf2c33..efd0a6800 100755
--- a/examples/last.py
+++ b/examples/last.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 try:
     from keys import misp_client_cert
@@ -32,7 +32,7 @@
     else:
         misp_client_cert = (misp_client_cert)
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, cert=misp_client_cert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert, cert=misp_client_cert)
     result = misp.search(publish_timestamp=args.last, limit=args.limit, page=args.page, pythonify=True)
 
     if not result:
diff --git a/examples/proofpoint_tap.py b/examples/proofpoint_tap.py
index d76aa3ffd..f6afdd91b 100644
--- a/examples/proofpoint_tap.py
+++ b/examples/proofpoint_tap.py
@@ -1,7 +1,7 @@
 import requests
 from requests.auth import HTTPBasicAuth
 import json
-from pymisp import ExpandedPyMISP, MISPEvent
+from pymisp import PyMISP, MISPEvent
 from keys import misp_url, misp_key, misp_verifycert, proofpoint_sp, proofpoint_secret
 import urllib3
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
@@ -11,7 +11,7 @@
     quit()
 
 # initialize PyMISP and set url for Panorama
-misp = ExpandedPyMISP(url=misp_url, key=misp_key, ssl=misp_verifycert)
+misp = PyMISP(url=misp_url, key=misp_key, ssl=misp_verifycert)
 
 urlSiem = "https://tap-api-v2.proofpoint.com/v2/siem/all"
 
diff --git a/examples/proofpoint_vap.py b/examples/proofpoint_vap.py
index 6cd863abd..1dd704c11 100644
--- a/examples/proofpoint_vap.py
+++ b/examples/proofpoint_vap.py
@@ -1,10 +1,10 @@
 import requests
 import json
-from pymisp import ExpandedPyMISP, MISPEvent, MISPOrganisation
+from pymisp import PyMISP, MISPEvent, MISPOrganisation
 from keys import misp_url, misp_key, misp_verifycert, proofpoint_key
 
 # initialize PyMISP and set url for Panorama
-misp = ExpandedPyMISP(url=misp_url, key=misp_key, ssl=misp_verifycert)
+misp = PyMISP(url=misp_url, key=misp_key, ssl=misp_verifycert)
 
 urlVap = "https://tap-api-v2.proofpoint.com/v2/people/vap?window=30"  # Window can be 14, 30, and 90 Days
 
diff --git a/examples/sharing_groups.py b/examples/sharing_groups.py
index dea34da9c..cd5a9491f 100755
--- a/examples/sharing_groups.py
+++ b/examples/sharing_groups.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -9,7 +9,7 @@
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Get a list of the sharing groups from the MISP instance.')
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     sharing_groups = misp.sharing_groups(pythonify=True)
     print(sharing_groups)
diff --git a/examples/show_sightings.py b/examples/show_sightings.py
index dd2cbe42a..217cf89ab 100644
--- a/examples/show_sightings.py
+++ b/examples/show_sightings.py
@@ -10,7 +10,7 @@
 
 '''
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 
 import sys
@@ -29,7 +29,7 @@ def init(url, key, verifycert):
     '''
         Template to get MISP module started
     '''
-    return ExpandedPyMISP(url, key, verifycert, 'json')
+    return PyMISP(url, key, verifycert, 'json')
 
 
 def set_drift_timestamp(drift_timestamp, drift_timestamp_path):
diff --git a/examples/stats_report.py b/examples/stats_report.py
index ef2b63c81..4fe6b3b8d 100755
--- a/examples/stats_report.py
+++ b/examples/stats_report.py
@@ -12,7 +12,7 @@
 
 '''
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 import os
@@ -36,7 +36,7 @@ def init(url, key, verifycert):
     '''
         Template to get MISP module started
     '''
-    return ExpandedPyMISP(url, key, verifycert, 'json')
+    return PyMISP(url, key, verifycert, 'json')
 
 
 def get_data(misp, timeframe, date_from=None, date_to=None):
diff --git a/examples/tags.py b/examples/tags.py
index 6bf3b9591..960e291dd 100755
--- a/examples/tags.py
+++ b/examples/tags.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 import json
@@ -18,7 +18,7 @@ def get_tags(m):
 
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     tags = misp.tags(pythonify=True)
     for tag in tags:
diff --git a/examples/up.py b/examples/up.py
index 31088eea5..4d2e20ae9 100755
--- a/examples/up.py
+++ b/examples/up.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPEvent
+from pymisp import PyMISP, MISPEvent
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -13,7 +13,7 @@
 
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     me = MISPEvent()
     me.load_file(args.input)
diff --git a/examples/upload.py b/examples/upload.py
index 447a9ea22..dd2744c3b 100755
--- a/examples/upload.py
+++ b/examples/upload.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPEvent, MISPAttribute
+from pymisp import PyMISP, MISPEvent, MISPAttribute
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 from pathlib import Path
@@ -17,7 +17,7 @@
     parser.add_argument("-i", "--info", help="Used to populate the event info field if no event ID supplied.")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     files = []
     p = Path(args.upload)
diff --git a/examples/users_list.py b/examples/users_list.py
index d62c78e07..f5d525911 100755
--- a/examples/users_list.py
+++ b/examples/users_list.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -9,7 +9,7 @@
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Get a list of the sharing groups from the MISP instance.')
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     users_list = misp.users(pythonify=True)
     print(users_list)
diff --git a/examples/vmray_automation.py b/examples/vmray_automation.py
index b87ba31a3..6571393d6 100644
--- a/examples/vmray_automation.py
+++ b/examples/vmray_automation.py
@@ -37,7 +37,7 @@
 import requests
 
 from keys import misp_key, misp_url, misp_verifycert
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 
 # Suppress those "Unverified HTTPS request is being made"
 import urllib3
@@ -75,7 +75,7 @@ def __init__(
         self.misp_url = misp_url.rstrip("/")
         self.misp_key = misp_key
         self.verifycert = verify_cert
-        self.misp = ExpandedPyMISP(misp_url, misp_key, ssl=verify_cert, debug=debug)
+        self.misp = PyMISP(misp_url, misp_key, ssl=verify_cert, debug=debug)
         self.config = {}
         self.tag_incomplete = 'workflow:state="incomplete"'