diff --git a/fbchat/__init__.py b/fbchat/__init__.py
index 6285a4b..0ea3bad 100644
--- a/fbchat/__init__.py
+++ b/fbchat/__init__.py
@@ -14,8 +14,8 @@ import logging as _logging
 _logging.getLogger(__name__).addHandler(_logging.NullHandler())
 
 # The order of these is somewhat significant, e.g. User has to be imported after Thread!
-from . import _core, _util
-from ._core import Image
+from . import _common, _util
+from ._common import Image
 from ._exception import (
     FacebookError,
     HTTPError,
diff --git a/fbchat/_attachment.py b/fbchat/_attachment.py
index fb785e9..90473ff 100644
--- a/fbchat/_attachment.py
+++ b/fbchat/_attachment.py
@@ -1,5 +1,5 @@
 import attr
-from ._core import attrs_default, Image
+from ._common import attrs_default, Image
 from . import _util
 
 from typing import Sequence
diff --git a/fbchat/_client.py b/fbchat/_client.py
index 1f01625..c6dd7f0 100644
--- a/fbchat/_client.py
+++ b/fbchat/_client.py
@@ -1,7 +1,7 @@
 import attr
 import datetime
 
-from ._core import log, attrs_default
+from ._common import log, attrs_default
 from . import (
     _exception,
     _util,
diff --git a/fbchat/_core.py b/fbchat/_common.py
similarity index 100%
rename from fbchat/_core.py
rename to fbchat/_common.py
diff --git a/fbchat/_events/_common.py b/fbchat/_events/_common.py
index e8b5338..913bb43 100644
--- a/fbchat/_events/_common.py
+++ b/fbchat/_events/_common.py
@@ -1,6 +1,6 @@
 import attr
 import abc
-from .._core import kw_only
+from .._common import kw_only
 from .. import _exception, _util, _thread, _group, _user, _message
 
 from typing import Any
diff --git a/fbchat/_file.py b/fbchat/_file.py
index d2aa3cc..035616b 100644
--- a/fbchat/_file.py
+++ b/fbchat/_file.py
@@ -1,6 +1,6 @@
 import attr
 import datetime
-from ._core import attrs_default, Image
+from ._common import attrs_default, Image
 from . import _util
 from ._attachment import Attachment
 
diff --git a/fbchat/_graphql.py b/fbchat/_graphql.py
index bf940a8..b2d9b78 100644
--- a/fbchat/_graphql.py
+++ b/fbchat/_graphql.py
@@ -1,6 +1,6 @@
 import json
 import re
-from ._core import log
+from ._common import log
 from . import _util, _exception
 
 # Shameless copy from https://stackoverflow.com/a/8730674
diff --git a/fbchat/_group.py b/fbchat/_group.py
index 5b7dab6..582ef6e 100644
--- a/fbchat/_group.py
+++ b/fbchat/_group.py
@@ -1,6 +1,6 @@
 import attr
 import datetime
-from ._core import attrs_default, Image
+from ._common import attrs_default, Image
 from . import _util, _session, _graphql, _plan, _thread, _user
 from typing import Sequence, Iterable, Set, Mapping
 
diff --git a/fbchat/_location.py b/fbchat/_location.py
index a1f29cb..b374db3 100644
--- a/fbchat/_location.py
+++ b/fbchat/_location.py
@@ -1,5 +1,5 @@
 import attr
-from ._core import attrs_default, Image
+from ._common import attrs_default, Image
 from ._attachment import Attachment
 from . import _util
 
diff --git a/fbchat/_message.py b/fbchat/_message.py
index 6db2f8e..3e9edef 100644
--- a/fbchat/_message.py
+++ b/fbchat/_message.py
@@ -2,7 +2,7 @@ import attr
 import datetime
 import enum
 from string import Formatter
-from ._core import log, attrs_default
+from ._common import log, attrs_default
 from . import (
     _exception,
     _util,
diff --git a/fbchat/_mqtt.py b/fbchat/_mqtt.py
index dfc38c4..2a582f8 100644
--- a/fbchat/_mqtt.py
+++ b/fbchat/_mqtt.py
@@ -2,7 +2,7 @@ import attr
 import random
 import paho.mqtt.client
 import requests
-from ._core import log, kw_only
+from ._common import log, kw_only
 from . import _util, _exception, _session, _graphql, _events
 
 from typing import Iterable, Optional
diff --git a/fbchat/_page.py b/fbchat/_page.py
index 0532b93..41845b0 100644
--- a/fbchat/_page.py
+++ b/fbchat/_page.py
@@ -1,6 +1,6 @@
 import attr
 import datetime
-from ._core import attrs_default, Image
+from ._common import attrs_default, Image
 from . import _session, _plan, _thread
 
 
diff --git a/fbchat/_plan.py b/fbchat/_plan.py
index 622c93b..f317f9e 100644
--- a/fbchat/_plan.py
+++ b/fbchat/_plan.py
@@ -1,7 +1,7 @@
 import attr
 import datetime
 import enum
-from ._core import attrs_default
+from ._common import attrs_default
 from . import _exception, _util, _session
 
 from typing import Mapping, Sequence
diff --git a/fbchat/_poll.py b/fbchat/_poll.py
index 519cd3a..0dd3e09 100644
--- a/fbchat/_poll.py
+++ b/fbchat/_poll.py
@@ -1,5 +1,5 @@
 import attr
-from ._core import attrs_default
+from ._common import attrs_default
 from . import _exception, _session
 from typing import Iterable, Sequence
 
diff --git a/fbchat/_quick_reply.py b/fbchat/_quick_reply.py
index 53919c1..294944f 100644
--- a/fbchat/_quick_reply.py
+++ b/fbchat/_quick_reply.py
@@ -1,5 +1,5 @@
 import attr
-from ._core import attrs_default
+from ._common import attrs_default
 from ._attachment import Attachment
 
 from typing import Any
diff --git a/fbchat/_session.py b/fbchat/_session.py
index 5d25e7e..cbf95ca 100644
--- a/fbchat/_session.py
+++ b/fbchat/_session.py
@@ -5,7 +5,7 @@ import requests
 import random
 import urllib.parse
 
-from ._core import log, kw_only
+from ._common import log, kw_only
 from . import _graphql, _util, _exception
 
 from typing import Optional, Tuple, Mapping, BinaryIO, Sequence, Iterable, Callable
diff --git a/fbchat/_sticker.py b/fbchat/_sticker.py
index 6479a67..dd7c1bc 100644
--- a/fbchat/_sticker.py
+++ b/fbchat/_sticker.py
@@ -1,5 +1,5 @@
 import attr
-from ._core import attrs_default, Image
+from ._common import attrs_default, Image
 from ._attachment import Attachment
 
 
diff --git a/fbchat/_thread.py b/fbchat/_thread.py
index d444d03..b6aab4e 100644
--- a/fbchat/_thread.py
+++ b/fbchat/_thread.py
@@ -3,7 +3,7 @@ import attr
 import collections
 import datetime
 import enum
-from ._core import log, attrs_default, Image
+from ._common import log, attrs_default, Image
 from . import _util, _exception, _session, _graphql, _attachment, _file, _plan, _message
 from typing import MutableMapping, Mapping, Any, Iterable, Tuple, Optional
 
diff --git a/fbchat/_user.py b/fbchat/_user.py
index 3d62ded..4090052 100644
--- a/fbchat/_user.py
+++ b/fbchat/_user.py
@@ -1,6 +1,6 @@
 import attr
 import datetime
-from ._core import log, attrs_default, Image
+from ._common import log, attrs_default, Image
 from . import _util, _session, _plan, _thread
 
 
diff --git a/fbchat/_util.py b/fbchat/_util.py
index 99e0905..9083966 100644
--- a/fbchat/_util.py
+++ b/fbchat/_util.py
@@ -4,7 +4,7 @@ import time
 import random
 import urllib.parse
 
-from ._core import log
+from ._common import log
 from . import _exception
 
 from typing import Iterable, Optional, Any