diff --git a/tests/common.py b/tests/common.py
index 8b9a797..6868987 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -2,8 +2,6 @@ import datetime
 import os.path
 import textwrap
 
-import changelog
-import version
 import yaclog.changelog
 
 log_segments = [
@@ -50,7 +48,7 @@ log_text = '\n\n'.join(log_segments)
 log = yaclog.Changelog()
 log.header = '# Changelog\n\nThis changelog is for testing the parser, and has many things in it that might trip it up.'
 log.links = {'id': 'http://www.koalastothemax.com'}
-log.versions = [changelog.VersionEntry(), changelog.VersionEntry(), changelog.VersionEntry()]
+log.versions = [yaclog.changelog.VersionEntry(), yaclog.changelog.VersionEntry(), yaclog.changelog.VersionEntry()]
 
 log.versions[0].name = '[Tests]'
 log.versions[0].sections = {
diff --git a/yaclog/cli/__main__.py b/yaclog/cli/__main__.py
index 6fb4066..3646076 100644
--- a/yaclog/cli/__main__.py
+++ b/yaclog/cli/__main__.py
@@ -19,8 +19,8 @@ import os.path
 import datetime
 import git
 
-import changelog
 import yaclog.version
+import yaclog.changelog
 from yaclog import Changelog
 
 
@@ -143,7 +143,7 @@ def entry(obj: Changelog, bullets, paragraphs, section_name, version_name):
     else:
         matches = [v for v in obj.versions if v.name.lower() == 'unreleased']
         if len(matches) == 0:
-            version = changelog.VersionEntry()
+            version = yaclog.changelog.VersionEntry()
             obj.versions.insert(0, version)
         else:
             version = matches[0]