diff --git a/monkey/infection_monkey/network/elasticfinger.py b/monkey/infection_monkey/network/elasticfinger.py
index 41eabd18a..790afa47d 100644
--- a/monkey/infection_monkey/network/elasticfinger.py
+++ b/monkey/infection_monkey/network/elasticfinger.py
@@ -6,7 +6,7 @@ import requests
 from requests.exceptions import Timeout, ConnectionError
 
 import infection_monkey.config
-import infection_monkey.network.HostFinger
+from infection_monkey.network.HostFinger import HostFinger
 from common.data.network_consts import ES_SERVICE
 
 ES_PORT = 9200
@@ -15,7 +15,7 @@ LOG = logging.getLogger(__name__)
 __author__ = 'danielg'
 
 
-class ElasticFinger(infection_monkey.network.HostFinger.HostFinger):
+class ElasticFinger(HostFinger):
     """
         Fingerprints elastic search clusters, only on port 9200
     """
diff --git a/monkey/infection_monkey/network/httpfinger.py b/monkey/infection_monkey/network/httpfinger.py
index ca5742c07..305a0b6e9 100644
--- a/monkey/infection_monkey/network/httpfinger.py
+++ b/monkey/infection_monkey/network/httpfinger.py
@@ -1,11 +1,11 @@
 import infection_monkey.config
-import infection_monkey.network.HostFinger
+from infection_monkey.network.HostFinger import HostFinger
 import logging
 
 LOG = logging.getLogger(__name__)
 
 
-class HTTPFinger(infection_monkey.network.HostFinger.HostFinger):
+class HTTPFinger(HostFinger):
     """
     Goal is to recognise HTTP servers, where what we currently care about is apache.
     """
diff --git a/monkey/infection_monkey/network/mssql_fingerprint.py b/monkey/infection_monkey/network/mssql_fingerprint.py
index 87d08541d..568de1528 100644
--- a/monkey/infection_monkey/network/mssql_fingerprint.py
+++ b/monkey/infection_monkey/network/mssql_fingerprint.py
@@ -2,7 +2,7 @@ import errno
 import logging
 import socket
 
-import infection_monkey.network.HostFinger
+from infection_monkey.network.HostFinger import HostFinger
 import infection_monkey.config
 
 __author__ = 'Maor Rayzin'
@@ -10,7 +10,7 @@ __author__ = 'Maor Rayzin'
 LOG = logging.getLogger(__name__)
 
 
-class MSSQLFinger(infection_monkey.network.HostFinger.HostFinger):
+class MSSQLFinger(HostFinger):
 
     # Class related consts
     SQL_BROWSER_DEFAULT_PORT = 1434
diff --git a/monkey/infection_monkey/network/mysqlfinger.py b/monkey/infection_monkey/network/mysqlfinger.py
index eef675507..e996c9ed6 100644
--- a/monkey/infection_monkey/network/mysqlfinger.py
+++ b/monkey/infection_monkey/network/mysqlfinger.py
@@ -2,7 +2,7 @@ import logging
 import socket
 
 import infection_monkey.config
-import infection_monkey.network.HostFinger
+from infection_monkey.network.HostFinger import HostFinger
 from infection_monkey.network.tools import struct_unpack_tracker, struct_unpack_tracker_string
 
 MYSQL_PORT = 3306
@@ -10,7 +10,7 @@ SQL_SERVICE = 'mysqld-3306'
 LOG = logging.getLogger(__name__)
 
 
-class MySQLFinger(infection_monkey.network.HostFinger.HostFinger):
+class MySQLFinger(HostFinger):
     """
         Fingerprints mysql databases, only on port 3306
     """
diff --git a/monkey/infection_monkey/network/ping_scanner.py b/monkey/infection_monkey/network/ping_scanner.py
index 899cc64b6..0461da05f 100644
--- a/monkey/infection_monkey/network/ping_scanner.py
+++ b/monkey/infection_monkey/network/ping_scanner.py
@@ -5,7 +5,7 @@ import subprocess
 import sys
 
 import infection_monkey.config
-import infection_monkey.network.HostFinger
+from infection_monkey.network.HostFinger import HostFinger
 import infection_monkey.network.HostScanner
 
 __author__ = 'itamar'
@@ -19,7 +19,7 @@ WINDOWS_TTL = 128
 LOG = logging.getLogger(__name__)
 
 
-class PingScanner(infection_monkey.network.HostScanner.HostScanner, infection_monkey.network.HostFinger.HostFinger):
+class PingScanner(infection_monkey.network.HostScanner.HostScanner, HostFinger):
 
     _SCANNED_SERVICE = ''
 
diff --git a/monkey/infection_monkey/network/smbfinger.py b/monkey/infection_monkey/network/smbfinger.py
index 529c1e91a..a13857a4a 100644
--- a/monkey/infection_monkey/network/smbfinger.py
+++ b/monkey/infection_monkey/network/smbfinger.py
@@ -3,7 +3,7 @@ import struct
 import logging
 from odict import odict
 
-import infection_monkey.network.HostFinger
+from infection_monkey.network.HostFinger import HostFinger
 
 SMB_PORT = 445
 SMB_SERVICE = 'tcp-445'
@@ -99,7 +99,7 @@ class SMBSessionFingerData(Packet):
         self.fields["bcc1"] = struct.pack("<i", len(self.fields["Data"]))[:2]
 
 
-class SMBFinger(infection_monkey.network.HostFinger.HostFinger):
+class SMBFinger(HostFinger):
     _SCANNED_SERVICE = 'SMB'
 
     def __init__(self):
diff --git a/monkey/infection_monkey/network/sshfinger.py b/monkey/infection_monkey/network/sshfinger.py
index cd1cd4aaf..a686d7fbd 100644
--- a/monkey/infection_monkey/network/sshfinger.py
+++ b/monkey/infection_monkey/network/sshfinger.py
@@ -1,7 +1,7 @@
 import re
 
 import infection_monkey.config
-import infection_monkey.network.HostFinger
+from infection_monkey.network.HostFinger import HostFinger
 from infection_monkey.network.tools import check_tcp_port
 
 SSH_PORT = 22
@@ -12,7 +12,7 @@ BANNER_READ = 1024
 LINUX_DIST_SSH = ['ubuntu', 'debian']
 
 
-class SSHFinger(infection_monkey.network.HostFinger.HostFinger):
+class SSHFinger(HostFinger):
     _SCANNED_SERVICE = 'SSH'
 
     def __init__(self):
diff --git a/monkey/infection_monkey/network/tcp_scanner.py b/monkey/infection_monkey/network/tcp_scanner.py
index 019417eb0..2d5bfa209 100644
--- a/monkey/infection_monkey/network/tcp_scanner.py
+++ b/monkey/infection_monkey/network/tcp_scanner.py
@@ -2,7 +2,7 @@ from itertools import zip_longest
 from random import shuffle
 
 import infection_monkey.config
-import infection_monkey.network.HostFinger
+from infection_monkey.network.HostFinger import HostFinger
 import infection_monkey.network.HostScanner
 from infection_monkey.network.tools import check_tcp_ports, tcp_port_to_service
 
@@ -11,7 +11,7 @@ __author__ = 'itamar'
 BANNER_READ = 1024
 
 
-class TcpScanner(infection_monkey.network.HostScanner.HostScanner, infection_monkey.network.HostFinger.HostFinger):
+class TcpScanner(infection_monkey.network.HostScanner.HostScanner, HostFinger):
     _SCANNED_SERVICE = 'unknown(TCP)'
 
     def __init__(self):