diff --git a/src/tagpack/__init__.py b/src/tagpack/__init__.py
index e7bd82d..f83f75a 100644
--- a/src/tagpack/__init__.py
+++ b/src/tagpack/__init__.py
@@ -10,7 +10,7 @@
 
 try:
     # Change here if project is renamed and does not equal the package name
-    dist_name = "graphsense-tagpack-tool"
+    dist_name = "tagpack-tool"
     __version__ = version(dist_name)
 except PackageNotFoundError:  # pragma: no cover
     __version__ = "unknown"
diff --git a/src/tagpack/cli.py b/src/tagpack/cli.py
index 33bac12..1078350 100644
--- a/src/tagpack/cli.py
+++ b/src/tagpack/cli.py
@@ -12,7 +12,7 @@
 from colorama import init
 from tabulate import tabulate
 
-from tagpack import __version__ as version
+from tagpack import get_version
 from tagpack.cmd_utils import (
     print_fail,
     print_info,
@@ -423,7 +423,7 @@ def remove_duplicates(args):
 
 
 def show_version():
-    return "GraphSense TagPack management tool v" + version
+    return f"GraphSense TagPack management tool {get_version()}"
 
 
 def read_url_from_env():
@@ -466,7 +466,9 @@ def main():
 
     parser = ArgumentParser(
         description="GraphSense TagPack validation and insert tool",
-        epilog="GraphSense TagPack Tool v{} - https://graphsense.info".format(version),
+        epilog="GraphSense TagPack Tool v{} - https://graphsense.info".format(
+            get_version()
+        ),
     )
     parser.add_argument("-v", "--version", action="version", version=show_version())
     parser.add_argument(