diff --git a/infection_monkey/config.py b/infection_monkey/config.py
index 1eacaef58..3472c63a8 100644
--- a/infection_monkey/config.py
+++ b/infection_monkey/config.py
@@ -9,7 +9,7 @@ from itertools import product
 from exploit import WmiExploiter, Ms08_067_Exploiter, SmbExploiter, RdpExploiter, SSHExploiter, ShellShockExploiter, \
     SambaCryExploiter, ElasticGroovyExploiter
 from network import TcpScanner, PingScanner, SMBFinger, SSHFinger, HTTPFinger, MySQLFinger, ElasticFinger, \
-    MSSQLFingerprint
+    MSSQLFinger
 
 __author__ = 'itamar'
 
diff --git a/infection_monkey/network/__init__.py b/infection_monkey/network/__init__.py
index 15c3166aa..fa15e357c 100644
--- a/infection_monkey/network/__init__.py
+++ b/infection_monkey/network/__init__.py
@@ -27,4 +27,4 @@ from elasticfinger import ElasticFinger
 from mysqlfinger import MySQLFinger
 from info import local_ips
 from info import get_free_tcp_port
-from mssql_fingerprint import MSSQLFingerprint
\ No newline at end of file
+from mssql_fingerprint import MSSQLFinger
\ No newline at end of file
diff --git a/infection_monkey/network/mssql_fingerprint.py b/infection_monkey/network/mssql_fingerprint.py
index ab17ecb3b..70f4f2369 100644
--- a/infection_monkey/network/mssql_fingerprint.py
+++ b/infection_monkey/network/mssql_fingerprint.py
@@ -9,13 +9,13 @@ __author__ = 'Maor Rayzin'
 LOG = logging.getLogger(__name__)
 
 
-class MSSQLFingerprint(HostFinger):
+class MSSQLFinger(HostFinger):
 
     # Class related consts
     SQL_BROWSER_DEFAULT_PORT = 1434
     BUFFER_SIZE = 4096
     TIMEOUT = 5
-    SERVICE_NAME = 'mssql'
+    SERVICE_NAME = 'MSSQL'
 
     def __init__(self):
         self._config = __import__('config').WormConfiguration
diff --git a/monkey_island/cc/services/config.py b/monkey_island/cc/services/config.py
index 390968a86..2887bf5a3 100644
--- a/monkey_island/cc/services/config.py
+++ b/monkey_island/cc/services/config.py
@@ -121,6 +121,14 @@ SCHEMA = {
                     ],
                     "title": "MySQLFinger"
                 },
+                {
+                    "type": "string",
+                    "enum": [
+                        "MSSQLFinger"
+                    ],
+                    "title": "MSSQLFinger"
+                },
+
                 {
                     "type": "string",
                     "enum": [
@@ -367,6 +375,7 @@ SCHEMA = {
                                 "PingScanner",
                                 "HTTPFinger",
                                 "MySQLFinger",
+                                "MSSQLFinger",
                                 "ElasticFinger"
                             ],
                             "description": "Determines which classes to use for fingerprinting"