diff --git a/historian/cli/common.py b/historian/cli/common.py
index 3c0a029f..3f511946 100644
--- a/historian/cli/common.py
+++ b/historian/cli/common.py
@@ -5,7 +5,7 @@
 from common import Base
 import io
 from pyln.proto.primitives import varint_decode
-from parser import parse
+from gossipd import parse
 import click
 import bz2
 
diff --git a/historian/cli/db.py b/historian/cli/db.py
index 42ddf9c7..5fadd002 100644
--- a/historian/cli/db.py
+++ b/historian/cli/db.py
@@ -1,7 +1,7 @@
 import click
 from common import NodeAnnouncement, ChannelAnnouncement, ChannelUpdate
 from tqdm import tqdm
-from parser import parse
+from gossipd import parse
 from cli.common import db_session, default_db
 
 
diff --git a/historian/common.py b/historian/common.py
index ad8a3afa..2a40d8ec 100644
--- a/historian/common.py
+++ b/historian/common.py
@@ -2,7 +2,7 @@
 from datetime import datetime
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy import Column, BigInteger, SmallInteger, DateTime, LargeBinary
-import parser
+import gossipd
 from contextlib import contextmanager
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
@@ -27,7 +27,7 @@ class ChannelUpdate(Base):
     raw = Column(LargeBinary)
 
     @classmethod
-    def from_gossip(cls, gcu: parser.ChannelUpdate,
+    def from_gossip(cls, gcu: gossipd.ChannelUpdate,
                     raw: bytes) -> 'ChannelUpdate':
         assert(raw[:2] == b'\x01\x02')
         self = ChannelUpdate()
@@ -53,7 +53,7 @@ class ChannelAnnouncement(Base):
     raw = Column(LargeBinary)
 
     @classmethod
-    def from_gossip(cls, gca: parser.ChannelAnnouncement,
+    def from_gossip(cls, gca: gossipd.ChannelAnnouncement,
                     raw: bytes) -> 'ChannelAnnouncement':
         assert(raw[:2] == b'\x01\x00')
         self = ChannelAnnouncement()
@@ -76,7 +76,7 @@ class NodeAnnouncement(Base):
     raw = Column(LargeBinary)
 
     @classmethod
-    def from_gossip(cls, gna: parser.NodeAnnouncement,
+    def from_gossip(cls, gna: gossipd.NodeAnnouncement,
                     raw: bytes) -> 'NodeAnnouncement':
         assert(raw[:2] == b'\x01\x01')
         self = NodeAnnouncement()
diff --git a/historian/parser.py b/historian/gossipd.py
similarity index 100%
rename from historian/parser.py
rename to historian/gossipd.py
diff --git a/historian/historian.py b/historian/historian.py
index fbe45997..85791274 100755
--- a/historian/historian.py
+++ b/historian/historian.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 from inotify import constants
 from inotify.adapters import Inotify
-from parser import parse
 from pyln.client import Plugin
 from sqlalchemy import create_engine
 from sqlalchemy import desc
@@ -9,7 +8,7 @@
 from threading import Thread
 from common import Base, ChannelAnnouncement, ChannelUpdate, NodeAnnouncement
 import logging
-import parser
+import gossipd
 import struct
 import time
 
@@ -152,7 +151,7 @@ def run(self):
 
     def store(self, raw: bytes) -> None:
         try:
-            msg = parse(raw)
+            msg = gossipd.parse(raw)
             cls = None
             if isinstance(msg, parser.ChannelUpdate):
                 cls = ChannelUpdate