diff --git a/ogn/collect/database.py b/ogn/collect/database.py
index 1a36dee..0123253 100644
--- a/ogn/collect/database.py
+++ b/ogn/collect/database.py
@@ -1,6 +1,6 @@
 from celery.utils.log import get_task_logger
 
-from ogn.model import DeviceInfo, AddressOrigin
+from ogn.model import DeviceInfo, DeviceInfoOrigin
 from ogn.utils import get_ddb
 
 from ogn.collect.celery import app
@@ -27,7 +27,7 @@ def import_ddb():
     """Import registered devices from the DDB."""
 
     logger.info("Import registered devices fom the DDB...")
-    address_origin = AddressOrigin.ogn_ddb
+    address_origin = DeviceInfoOrigin.ogn_ddb
 
     counter = update_device_infos(app.session, address_origin)
     logger.info("Imported {} devices.".format(counter))
@@ -38,7 +38,7 @@ def import_file(path='tests/custom_ddb.txt'):
     """Import registered devices from a local file."""
 
     logger.info("Import registered devices from '{}'...".format(path))
-    address_origin = AddressOrigin.user_defined
+    address_origin = DeviceInfoOrigin.user_defined
 
     counter = update_device_infos(app.session, address_origin, csvfile=path)
     logger.info("Imported {} devices.".format(counter))
diff --git a/ogn/commands/bulkimport.py b/ogn/commands/bulkimport.py
index d77a3b1..0a0d3a5 100644
--- a/ogn/commands/bulkimport.py
+++ b/ogn/commands/bulkimport.py
@@ -184,7 +184,7 @@ def import_logfile(path):
         else:
             print("For {} beacons already exist. Skipping".format(reference_date_string))
     else:
-        print("Unknown file type: {}".format())
+        print("Unknown file type: {}".format(tail))
 
 
 def check_no_beacons(tablename, reference_date_string):
diff --git a/ogn/commands/database.py b/ogn/commands/database.py
index 9af5717..2dfc60b 100644
--- a/ogn/commands/database.py
+++ b/ogn/commands/database.py
@@ -1,7 +1,7 @@
 from manager import Manager
 from ogn.collect.database import update_device_infos
 from ogn.commands.dbutils import engine, session
-from ogn.model import Base, AddressOrigin, AircraftBeacon, ReceiverBeacon, Device, Receiver
+from ogn.model import Base, DeviceInfoOrigin, AircraftBeacon, ReceiverBeacon, Device, Receiver
 from ogn.utils import get_airports
 from sqlalchemy import insert, distinct
 from sqlalchemy.sql import null
@@ -53,7 +53,7 @@ def import_ddb():
     """Import registered devices from the DDB."""
 
     print("Import registered devices fom the DDB...")
-    address_origin = AddressOrigin.ogn_ddb
+    address_origin = DeviceInfoOrigin.ogn_ddb
     counter = update_device_infos(session,
                                   address_origin)
     print("Imported %i devices." % counter)
@@ -65,7 +65,7 @@ def import_file(path='tests/custom_ddb.txt'):
     # (flushes previously manually imported entries)
 
     print("Import registered devices from '{}'...".format(path))
-    address_origin = AddressOrigin.user_defined
+    address_origin = DeviceInfoOrigin.user_defined
     counter = update_device_infos(session,
                                   address_origin,
                                   csvfile=path)
diff --git a/ogn/commands/showdeviceinfos.py b/ogn/commands/showdeviceinfos.py
index b39b856..b1a46aa 100644
--- a/ogn/commands/showdeviceinfos.py
+++ b/ogn/commands/showdeviceinfos.py
@@ -1,6 +1,6 @@
 from manager import Manager
 from ogn.commands.dbutils import session
-from ogn.model import AddressOrigin
+from ogn.model import DeviceInfoOrigin
 from ogn.model.device_info import DeviceInfo
 from sqlalchemy import func, and_, true, false
 
@@ -39,7 +39,7 @@ def get_devices_stats(session):
 
     stats = {}
     for [address_origin, device_count, default_count, nt_count, ni_count, ntni_count] in query.all():
-        origin = AddressOrigin(address_origin).name()
+        origin = DeviceInfoOrigin(address_origin).name()
         stats[origin] = {'device_count': device_count,
                          'default_count': default_count,
                          'nt_count': nt_count,
diff --git a/ogn/model/__init__.py b/ogn/model/__init__.py
index e83b673..42f8385 100644
--- a/ogn/model/__init__.py
+++ b/ogn/model/__init__.py
@@ -1,10 +1,10 @@
 # flake8: noqa
-from .address_origin import AddressOrigin
 from .aircraft_type import AircraftType
 from .base import Base
 from .beacon import Beacon
 from .device import Device
 from .device_info import DeviceInfo
+from .device_info_origin import DeviceInfoOrigin
 from .aircraft_beacon import AircraftBeacon
 from .receiver_beacon import ReceiverBeacon
 from .receiver import Receiver
diff --git a/ogn/model/address_origin.py b/ogn/model/device_info_origin.py
similarity index 96%
rename from ogn/model/address_origin.py
rename to ogn/model/device_info_origin.py
index a269973..4105169 100644
--- a/ogn/model/address_origin.py
+++ b/ogn/model/device_info_origin.py
@@ -1,4 +1,4 @@
-class AddressOrigin:
+class DeviceInfoOrigin:
     unknown = 0
     ogn_ddb = 1
     flarmnet = 2
diff --git a/ogn/utils.py b/ogn/utils.py
index fa7caf2..d5ab334 100644
--- a/ogn/utils.py
+++ b/ogn/utils.py
@@ -8,7 +8,7 @@ from geopy.geocoders import Nominatim
 from ogn.parser.utils import feet2m
 import requests
 
-from .model import AddressOrigin, DeviceInfo, Airport, Location
+from .model import DeviceInfoOrigin, DeviceInfo, Airport, Location
 
 
 DDB_URL = "http://ddb.glidernet.org/download/?t=1"
@@ -22,7 +22,7 @@ nm2m = 1852
 mi2m = 1609.34
 
 
-def get_ddb(csvfile=None, address_origin=AddressOrigin.unknown):
+def get_ddb(csvfile=None, device_info_origin=DeviceInfoOrigin.unknown):
     if csvfile is None:
         r = requests.get(DDB_URL)
         rows = '\n'.join(i for i in r.text.splitlines() if i[0] != '#')
@@ -43,7 +43,7 @@ def get_ddb(csvfile=None, address_origin=AddressOrigin.unknown):
         device_info.tracked = row[5] == 'Y'
         device_info.identified = row[6] == 'Y'
         device_info.aircraft_type = int(row[7])
-        device_info.address_origin = address_origin
+        device_info.address_origin = device_info_origin
 
         device_infos.append(device_info)